wxWidgets 3.2: wxTHICK_FRAME is gone

Author: saper

TAO/utils/wxNamingViewer/wxAddNameServerDlg.cpp

@@ -98,7 +98,13 @@ WxAddNameServerDlg::WxAddNameServerDlg( wxWindow* parent)
       "Add Name Server",
       wxDefaultPosition,
       wxSize(186,69),
-      wxRAISED_BORDER | wxCAPTION | wxTHICK_FRAME | wxSYSTEM_MENU,
+      wxRAISED_BORDER | wxCAPTION |
+#if wxABI_VERSION < 20800
+      wxTHICK_FRAME   |
+#else
+      wxRESIZE_BORDER |
+#endif
+      wxSYSTEM_MENU,
       "addNameServer")
 #endif  // defined(wxUSE_RESOURCES) && (wxUSE_RESOURCES == 1)
   , ior("")

TAO/utils/wxNamingViewer/wxBindDialog.cpp

@@ -82,7 +82,13 @@ WxBindDialog::WxBindDialog(
       "Bind Object/Context",
       wxDefaultPosition,
       wxSize( 300, 75),
-      wxRAISED_BORDER | wxCAPTION | wxTHICK_FRAME | wxSYSTEM_MENU,
+      wxRAISED_BORDER | wxCAPTION |
+#if wxABI_VERSION < 20800
+      wxTHICK_FRAME |
+#else
+      wxRESIZE_BORDER |
+#endif
+      wxSYSTEM_MENU,
       "bindObject")
 #endif  // defined(wxUSE_RESOURCES) && (wxUSE_RESOURCES == 1)
   , ior()

TAO/utils/wxNamingViewer/wxBindNewContext.cpp

@@ -95,7 +95,13 @@ WxBindNewContext::WxBindNewContext( wxWindow* parent)
        "Bind New Context",
        wxDefaultPosition,
        wxSize( 300, 75),
-       wxRAISED_BORDER | wxCAPTION | wxTHICK_FRAME | wxSYSTEM_MENU,
+       wxRAISED_BORDER | wxCAPTION |
+#if wxABI_VERSION < 20800
+       wxTHICK_FRAME |
+#else
+       wxRESIZE_BORDER |
+#endif
+       wxSYSTEM_MENU,
        "bindNewContext")
 #endif  // defined(wxUSE_RESOURCES) && (wxUSE_RESOURCES == 1)
  {

TAO/utils/wxNamingViewer/wxNamingViewer.wxr

@@ -1,5 +1,5 @@
 static char *bindObject = "dialog(name = 'bindObject',\
-  style = 'wxRAISED_BORDER | wxCAPTION | wxTHICK_FRAME | wxSYSTEM_MENU',\
+  style = 'wxRAISED_BORDER | wxCAPTION | wxRESIZE_BORDER | wxSYSTEM_MENU',\
   title = 'Bind Object/Context',\
   id = 133,\
   x = -1, y = -1, width = 274, height = 66,\
@@ -27,7 +27,7 @@ static char *bindObject = "dialog(name = 'bindObject',\
       [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']]).";
 
 static char *addNameServer = "dialog(name = 'addNameServer',\
-  style = 'wxRAISED_BORDER | wxCAPTION | wxTHICK_FRAME | wxSYSTEM_MENU',\
+  style = 'wxRAISED_BORDER | wxCAPTION | wxRESIZE_BORDER | wxSYSTEM_MENU',\
   title = 'Add Name Server',\
   id = 136,\
   x = -1, y = -1, width = 186, height = 69,\
@@ -49,7 +49,7 @@ static char *addNameServer = "dialog(name = 'addNameServer',\
       [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']]).";
 
 static char *bindNewContext = "dialog(name = 'bindNewContext',\
-  style = 'wxRAISED_BORDER | wxCAPTION | wxTHICK_FRAME | wxSYSTEM_MENU',\
+  style = 'wxRAISED_BORDER | wxCAPTION | wxRESIZE_BORDER | wxSYSTEM_MENU',\
   title = 'Bind New Context',\
   id = 134,\
   x = -1, y = -1, width = 154, height = 76,\
@@ -71,7 +71,7 @@ static char *bindNewContext = "dialog(name = 'bindNewContext',\
       [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']]).";
 
 static char *viewIOR = "dialog(name = 'viewIOR',\
-  style = 'wxRAISED_BORDER | wxCAPTION | wxTHICK_FRAME | wxSYSTEM_MENU',\
+  style = 'wxRAISED_BORDER | wxCAPTION | wxRESIZE_BORDER | wxSYSTEM_MENU',\
   title = 'View IOR',\
   id = 102,\
   x = -1, y = -1, width = 394, height = 127,\
@@ -93,7 +93,7 @@ static char *viewIOR = "dialog(name = 'viewIOR',\
       [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']]).";
 
 static char *selectNS = "dialog(name = 'selectNS',\
-  style = 'wxRAISED_BORDER | wxCAPTION | wxTHICK_FRAME | wxSYSTEM_MENU',\
+  style = 'wxRAISED_BORDER | wxCAPTION | wxRESIZE_BORDER | wxSYSTEM_MENU',\
   title = 'Select Naming Service',\
   id = 135,\
   x = -1, y = -1, width = 181, height = 94,\

TAO/utils/wxNamingViewer/wxSelectNSDialog.cpp

@@ -93,7 +93,13 @@ WxSelectNSDialog::WxSelectNSDialog( wxWindow* parent)
       "Select Naming Service",
       wxDefaultPosition,
       wxSize(181,94),
-      wxRAISED_BORDER | wxCAPTION | wxTHICK_FRAME | wxSYSTEM_MENU,
+      wxRAISED_BORDER | wxCAPTION |
+#if wxABI_VERSION < 20800
+      wxTHICK_FRAME |
+#else
+      wxRESIZE_BORDER |
+#endif
+      wxSYSTEM_MENU,
       "selectNS")
 #endif  // defined(wxUSE_RESOURCES) && (wxUSE_RESOURCES == 1)
   , config( 0)

TAO/utils/wxNamingViewer/wxViewIORDialog.cpp

@@ -134,7 +134,13 @@ WxViewIORDialog::WxViewIORDialog(
       "View IOR",
       wxDefaultPosition,
       wxSize(394,127),
-      wxRAISED_BORDER | wxCAPTION | wxTHICK_FRAME | wxSYSTEM_MENU,
+      wxRAISED_BORDER | wxCAPTION |
+#if wxABI_VERSION < 20800
+      wxTHICK_FRAME |
+#else
+      wxRESIZE_BORDER |
+#endif
+      wxSYSTEM_MENU,
       "viewIOR")
 #endif  // defined(wxUSE_RESOURCES) && (wxUSE_RESOURCES == 1)
   , orb( orb)