wxGUI: update wx4.1.0 support for FlatNotebook (#856)

addresses two separate, but interlinked issues:
- addition of FlatNotebook.FNB_NODRAG window style flag to prevent
  macOS GUI crash on switching tabs
- dark mode support

gui/wxpython/core/globalvar.py

@@ -134,13 +134,14 @@ Deleted automatically on re-render action
 QUERYLAYER = 'qlayer'
 
 """Style definition for FlatNotebook pages"""
-FNPageStyle = FN.FNB_VC8 | \
+FNPageStyle = FN.FNB_FF2 | \
     FN.FNB_BACKGROUND_GRADIENT | \
     FN.FNB_NODRAG | \
     FN.FNB_TABS_BORDER_SIMPLE
 
 FNPageDStyle = FN.FNB_FANCY_TABS | \
     FN.FNB_BOTTOM | \
+    FN.FNB_NODRAG | \
     FN.FNB_NO_NAV_BUTTONS | \
     FN.FNB_NO_X_BUTTON
 

gui/wxpython/dbmgr/base.py

@@ -1184,7 +1184,7 @@ class DbMgrBrowsePage(DbMgrNotebookBase):
 
         # sql statement box
         FNPageStyle = FN.FNB_NO_NAV_BUTTONS | \
-            FN.FNB_NO_X_BUTTON
+            FN.FNB_NO_X_BUTTON | FN.FNB_NODRAG | FN.FNB_FANCY_TABS
         if globalvar.hasAgw:
             dbmStyle = {'agwStyle': FNPageStyle}
         else:

gui/wxpython/gmodeler/frame.py

@@ -124,11 +124,11 @@ class ModelFrame(wx.Frame):
         self.statusbar = self.CreateStatusBar(number=1)
 
         self.notebook = GNotebook(parent=self,
-                                  style=FN.FNB_FANCY_TABS | FN.FNB_BOTTOM |
-                                  FN.FNB_NO_NAV_BUTTONS | FN.FNB_NO_X_BUTTON)
+                                  style=globalvar.FNPageDStyle)
 
         self.canvas = ModelCanvas(self)
-        self.canvas.SetBackgroundColour(wx.WHITE)
+        self.canvas.SetBackgroundColour(
+            wx.SystemSettings().GetColour(wx.SYS_COLOUR_WINDOW))
         self.canvas.SetCursor(self.cursors["default"])
 
         self.model = Model(self.canvas)

gui/wxpython/lmgr/frame.py

@@ -311,14 +311,10 @@ class GMFrame(wx.Frame):
                 parent=self, style=globalvar.FNPageDStyle)
         else:
             self.notebook = FormNotebook(parent=self, style=wx.NB_BOTTOM)
-        # create displays notebook widget and add it to main notebook page
-        cbStyle = globalvar.FNPageStyle
-        if globalvar.hasAgw:
-            self.notebookLayers = FN.FlatNotebook(
-                self.notebook, id=wx.ID_ANY, agwStyle=cbStyle)
-        else:
-            self.notebookLayers = FN.FlatNotebook(
-                self.notebook, id=wx.ID_ANY, style=cbStyle)
+
+        # create displays notebook widget
+        self.notebookLayers = GNotebook(parent=self.notebook,
+                                        style=globalvar.FNPageStyle)
         self.notebookLayers.SetTabAreaColour(globalvar.FNPageColor)
         menu = self._createTabMenu()
         self.notebookLayers.SetRightClickMenu(menu)
@@ -2113,7 +2109,8 @@ class GMFrame(wx.Frame):
             dispName = name
         else:
             dispName = "Display " + str(self.displayIndex + 1)
-        self.notebookLayers.AddPage(self.pg_panel, text=dispName, select=True)
+        self.notebookLayers.AddPage(
+            page=self.pg_panel, text=dispName, select=True)
         self.currentPage = self.notebookLayers.GetCurrentPage()
 
         # create layer tree (tree control for managing GIS layers)  and put on

gui/wxpython/modules/import_export.py

@@ -129,8 +129,7 @@ class ImportDialog(wx.Dialog):
         self.Bind(wx.EVT_CLOSE, lambda evt: self.Destroy())
 
         self.notebook = GNotebook(parent=self,
-                                  style=FN.FNB_FANCY_TABS | FN.FNB_BOTTOM |
-                                  FN.FNB_NO_X_BUTTON)
+                                  style=globalvar.FNPageDStyle)
 
         self.notebook.AddPage(page=self.panel,
                               text=_('Source settings'),

gui/wxpython/psmap/frame.py

@@ -223,14 +223,14 @@ class PsMapFrame(wx.Frame):
         """
         mainSizer = wx.BoxSizer(wx.VERTICAL)
         if globalvar.hasAgw:
-            self.book = fnb.FlatNotebook(parent=self, id=wx.ID_ANY,
-                                         agwStyle=fnb.FNB_FANCY_TABS | fnb.FNB_BOTTOM |
-                                         fnb.FNB_NO_NAV_BUTTONS | fnb.FNB_NO_X_BUTTON)
+            self.book = fnb.FlatNotebook(parent=self,
+                                         id=wx.ID_ANY,
+                                         agwStyle=globalvar.FNPageDStyle)
         else:
-            self.book = fnb.FlatNotebook(parent=self, id=wx.ID_ANY,
-                                         style=fnb.FNB_FANCY_TABS | fnb.FNB_BOTTOM |
-                                         fnb.FNB_NO_NAV_BUTTONS | fnb.FNB_NO_X_BUTTON)
-        #self.book = fnb.FlatNotebook(self, wx.ID_ANY, style = fnb.FNB_BOTTOM)
+            self.book = fnb.FlatNotebook(parent=self,
+                                         id=wx.ID_ANY,
+                                         style=globalvar.FNPageDStyle)
+
         self.book.AddPage(self.canvas, "Draft mode")
         self.book.AddPage(self.previewCanvas, "Preview")
         self.book.SetSelection(0)

gui/wxpython/tplot/frame.py

@@ -172,7 +172,8 @@ class TplotFrame(wx.Frame):
         # self.vbox.AddSpacer(10)
 
         # ------------ADD NOTEBOOK------------
-        self.ntb = GNotebook(parent=self.mainPanel, style=FN.FNB_FANCY_TABS)
+        self.ntb = GNotebook(parent=self.mainPanel,
+                             style=FN.FNB_FANCY_TABS | FN.FNB_NODRAG)
 
         # ------------ITEMS IN NOTEBOOK PAGE (RASTER)------------------------
 

gui/wxpython/vnet/dialogs.py

@@ -128,8 +128,7 @@ class VNETDialog(wx.Dialog):
 
         self.mainPanel = Panel(parent=self)
         self.notebook = GNotebook(parent=self.mainPanel,
-                                  style=FN.FNB_FANCY_TABS | FN.FNB_BOTTOM |
-                                  FN.FNB_NO_X_BUTTON)
+                                  style=globalvar.FNPageDStyle)
 
         # statusbar
         self.stPriorities = {'important': 5, 'iformation': 1}

gui/wxpython/web_services/widgets.py

@@ -135,8 +135,9 @@ class WSPanel(wx.Panel):
         reqDataBox = StaticBox(
             parent=self, label=_(" Requested data settings "))
         self._nb_sizer = wx.StaticBoxSizer(reqDataBox, wx.VERTICAL)
-        self.notebook = GNotebook(parent=self,
-                                  style=FN.FNB_FANCY_TABS | FN.FNB_NO_X_BUTTON)
+        self.notebook = GNotebook(
+            parent=self,
+            style=FN.FNB_FANCY_TABS | FN.FNB_NO_X_BUTTON | FN.FNB_NODRAG)
 
         self._requestPage()
         self._advancedSettsPage()