[med-svn] [Git][med-team/treeviewx][master] 2 commits: Patch for compatibility with wxWidgets 3.2

[Étienne Mollier (@emollier)]

Étienne Mollier pushed to branch master at Debian Med / treeviewx


Commits:
f16d68fe by Scott Talbert at 2022-09-16T14:19:05-04:00
Patch for compatibility with wxWidgets 3.2

- - - - -
e8a072e0 by Étienne Mollier at 2022-09-16T20:15:34+00:00
Merge branch 'wx3.2' into 'master'

Patch for compatibility with wxWidgets 3.2

See merge request med-team/treeviewx!2
- - - - -


3 changed files:

- debian/changelog
- debian/patches/series
- + debian/patches/wx3.2-compat.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,13 @@
 treeviewx (0.5.1+git20100823.7e4d0e9-4) UNRELEASED; urgency=medium
 
+  [ Andreas Tille ]
   * transition to wxwidgets3.2
     Closes: #1019811
   * Standards-Version: 4.6.1 (routine-update)
 
+  [ Scott Talbert ]
+  * Patch for compatibility with wxWidgets 3.2
+
  -- Andreas Tille <tille at debian.org>  Thu, 15 Sep 2022 09:30:42 +0200
 
 treeviewx (0.5.1+git20100823.7e4d0e9-3) unstable; urgency=medium


=====================================
debian/patches/series
=====================================
@@ -5,3 +5,4 @@ wx3.0-compat.patch
 svg.patch
 treeview-xpm-not-xbm.patch
 wxstring-maxlen.patch
+wx3.2-compat.patch


=====================================
debian/patches/wx3.2-compat.patch
=====================================
@@ -0,0 +1,61 @@
+Description: Fix to work with wxWidgets 3.2
+Author: Scott Talbert <swt at techie.net>
+Last-Update: 2022-09-16
+Bug-Debian: https://bugs.debian.org/1019811
+Forwarded: no
+
+--- a/tv.cpp
++++ b/tv.cpp
+@@ -486,37 +486,37 @@ void MyFrame::InitToolBar(wxToolBar* too
+ 	// The toolbar for the Mac is associated with each document window, not the MDI frame,
+ 	// so we don't display Open and Save as buttons
+ #else
+-	toolBar->AddTool( wxID_NEW, *(bitmaps[11]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, wxT("New document"));
++	toolBar->AddTool( wxID_NEW, wxEmptyString, *(bitmaps[11]), wxT("New document"));
+ 	currentX += width + 5;
+-	toolBar->AddTool( wxID_OPEN, *(bitmaps[0]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, wxT("Open document"));
++	toolBar->AddTool( wxID_OPEN, wxEmptyString, *(bitmaps[0]), wxT("Open document"));
+ 	currentX += width + 5;
+-	toolBar->AddTool(wxID_SAVEAS, *bitmaps[1], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, wxT("Save document"));
++	toolBar->AddTool(wxID_SAVEAS, wxEmptyString, *bitmaps[1], wxT("Save document"));
+ 	currentX += width + 5;
+ #endif
+-	toolBar->AddTool(wxID_COPY, *bitmaps[2], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, wxT("Copy tree to clipboard"));
++	toolBar->AddTool(wxID_COPY, wxEmptyString, *bitmaps[2], wxT("Copy tree to clipboard"));
+ 	currentX += width + 5;
+-	toolBar->AddTool(wxID_PASTE, *bitmaps[10], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, wxT("Paste tree descriiption from clipboard"));
++	toolBar->AddTool(wxID_PASTE, wxEmptyString, *bitmaps[10], wxT("Paste tree descriiption from clipboard"));
+ 	currentX += width + 5;
+ 	// --
+ 	toolBar->AddSeparator();
+-	toolBar->AddTool(wxID_PREVIEW, *bitmaps[3], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, wxT("Print preview"));
+-	toolBar->AddTool(wxID_PRINT, *bitmaps[4], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, wxT("Print"));
++	toolBar->AddTool(wxID_PREVIEW, wxEmptyString, *bitmaps[3], wxT("Print preview"));
++	toolBar->AddTool(wxID_PRINT, wxEmptyString, *bitmaps[4], wxT("Print"));
+ 	//--
+ 	toolBar->AddSeparator();
+-	toolBar->AddTool(PREVIOUS_TREE_CMD, *bitmaps[5], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, wxT("Previous tree"));
+-	toolBar->AddTool(NEXT_TREE_CMD, *bitmaps[6], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, wxT("Next tree"));
++	toolBar->AddTool(PREVIOUS_TREE_CMD, wxEmptyString, *bitmaps[5], wxT("Previous tree"));
++	toolBar->AddTool(NEXT_TREE_CMD, wxEmptyString, *bitmaps[6], wxT("Next tree"));
+ 	//--
+ 	toolBar->AddSeparator();
+-	toolBar->AddTool(SLANTED_TREE_CMD, *bitmaps[7], wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, wxT("Slanted cladogram"));
+-	toolBar->AddTool(RECTANGULAR_TREE_CMD, *bitmaps[8], wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, wxT("Rectangular cladogram"));
+-	toolBar->AddTool(PHYLOGRAM_CMD, *bitmaps[9], wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, wxT("Phylogram"));
++	toolBar->AddTool(SLANTED_TREE_CMD, wxEmptyString, *bitmaps[7], wxT("Slanted cladogram"), wxITEM_CHECK);
++	toolBar->AddTool(RECTANGULAR_TREE_CMD, wxEmptyString, *bitmaps[8], wxT("Rectangular cladogram"), wxITEM_CHECK);
++	toolBar->AddTool(PHYLOGRAM_CMD, wxEmptyString, *bitmaps[9], wxT("Phylogram"), wxITEM_CHECK);
+ 	//--
+  	toolBar->AddSeparator();
+-	toolBar->AddTool(INTERNAL_LABELS_CMD, *bitmaps[14], wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, wxT("Show internal node labels"));
++	toolBar->AddTool(INTERNAL_LABELS_CMD, wxEmptyString, *bitmaps[14], wxT("Show internal node labels"), wxITEM_CHECK);
+ 	//--
+ 	toolBar->AddSeparator();
+-	toolBar->AddTool(ZOOM_IN_CMD, *bitmaps[12], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, wxT("Zoom in"));
+-	toolBar->AddTool(ZOOM_OUT_CMD, *bitmaps[13], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, wxT("Zoom out"));
++	toolBar->AddTool(ZOOM_IN_CMD, wxEmptyString, *bitmaps[12], wxT("Zoom in"));
++	toolBar->AddTool(ZOOM_OUT_CMD, wxEmptyString, *bitmaps[13], wxT("Zoom out"));
+ 
+ 	toolBar->Realize();
+ 



View it on GitLab: https://salsa.debian.org/med-team/treeviewx/-/compare/5167b5da816e4c868d0445212e200e1ae598ca83...e8a072e01b1dbd911b3755a94d8f0a6b35d995b4

-- 
View it on GitLab: https://salsa.debian.org/med-team/treeviewx/-/compare/5167b5da816e4c868d0445212e200e1ae598ca83...e8a072e01b1dbd911b3755a94d8f0a6b35d995b4
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20220916/9468384d/attachment-0001.htm>