From: David Webster <Dave.Webster@bhmi.com>
Date: Wed, 9 Jan 2002 23:16:22 +0000 (+0000)
Subject: Lots of cleanup, mostly consolidating globals
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/511ac294daea69d4bae9644db2fb272c712e059c?ds=inline

Lots of cleanup, mostly consolidating globals


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h
index 092a589d87..d4f92f470d 100644
--- a/include/wx/os2/button.h
+++ b/include/wx/os2/button.h
@@ -14,8 +14,6 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
-
 // Pushbutton
 class WXDLLEXPORT wxButton: public wxButtonBase
 {
diff --git a/include/wx/os2/checkbox.h b/include/wx/os2/checkbox.h
index a8e7a2cb74..12a43f701d 100644
--- a/include/wx/os2/checkbox.h
+++ b/include/wx/os2/checkbox.h
@@ -13,7 +13,6 @@
 #define _WX_CHECKBOX_H_
 
 #include "wx/control.h"
-                               WXDLLEXPORT_DATA(extern const char*) wxCheckBoxNameStr;
 
 // Checkbox item (single checkbox)
 class WXDLLEXPORT wxBitmap;
diff --git a/include/wx/os2/choice.h b/include/wx/os2/choice.h
index 883bfe3423..103a675808 100644
--- a/include/wx/os2/choice.h
+++ b/include/wx/os2/choice.h
@@ -12,8 +12,6 @@
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 
-WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
-
 // Choice item
 class WXDLLEXPORT wxChoice: public wxChoiceBase
 {
diff --git a/include/wx/os2/combobox.h b/include/wx/os2/combobox.h
index 1678e513f1..2f2e957b1f 100644
--- a/include/wx/os2/combobox.h
+++ b/include/wx/os2/combobox.h
@@ -16,9 +16,6 @@
 
 #if wxUSE_COMBOBOX
 
-WXDLLEXPORT_DATA(extern const char*) wxComboBoxNameStr;
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
-
 // Combobox item
 class WXDLLEXPORT wxComboBox : public wxChoice
 {
diff --git a/include/wx/os2/control.h b/include/wx/os2/control.h
index 8973977ea7..661efc7b06 100644
--- a/include/wx/os2/control.h
+++ b/include/wx/os2/control.h
@@ -14,8 +14,6 @@
 
 #include "wx/dynarray.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr;
-
 // General item class
 class WXDLLEXPORT wxControl : public wxControlBase
 {
diff --git a/include/wx/os2/font.h b/include/wx/os2/font.h
index 6cad73deff..a306601251 100644
--- a/include/wx/os2/font.h
+++ b/include/wx/os2/font.h
@@ -107,6 +107,7 @@ public:
     //
     // For internal use only!
     //
+    void SetPS(HPS hPS);
     void SetFM( PFONTMETRICS pFM
                ,int          nNumFonts
               );
diff --git a/include/wx/os2/gauge.h b/include/wx/os2/gauge.h
index 67378ff770..d7dd800512 100644
--- a/include/wx/os2/gauge.h
+++ b/include/wx/os2/gauge.h
@@ -14,8 +14,6 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxGaugeNameStr;
-
 class WXDLLEXPORT wxGauge: public wxControl
 {
 public:
diff --git a/include/wx/os2/mdi.h b/include/wx/os2/mdi.h
index eaab8a9289..556ab95a0c 100644
--- a/include/wx/os2/mdi.h
+++ b/include/wx/os2/mdi.h
@@ -16,9 +16,6 @@
 
 #include "wx/frame.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr;
-WXDLLEXPORT_DATA(extern const char*) wxStatusLineNameStr;
-
 class WXDLLEXPORT wxMDIClientWindow;
 class WXDLLEXPORT wxMDIChildFrame;
 
diff --git a/include/wx/os2/msgdlg.h b/include/wx/os2/msgdlg.h
index ab51303670..d5fda7dc58 100644
--- a/include/wx/os2/msgdlg.h
+++ b/include/wx/os2/msgdlg.h
@@ -20,8 +20,6 @@
  * Message box dialog
  */
 
-WXDLLEXPORT_DATA(extern const char*) wxMessageBoxCaptionStr;
-
 class WXDLLEXPORT wxMessageDialog : public wxDialog
 {
 DECLARE_DYNAMIC_CLASS(wxMessageDialog)
diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h
index 039859ed51..6217e7394a 100644
--- a/include/wx/os2/private.h
+++ b/include/wx/os2/private.h
@@ -43,6 +43,64 @@ static const double twips2mm = (1/(METRIC_CONVERSION_CONSTANT*1440));
 static const double mm2pt = (METRIC_CONVERSION_CONSTANT*72);
 static const double pt2mm = (1/(METRIC_CONVERSION_CONSTANT*72));
 
+//
+// Constant strings for control names and classes
+//
+
+//
+// Controls
+//
+WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxCanvasNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxCheckBoxNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBoxNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxListBoxNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxStaticTextNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxMultiTextNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxRadioBoxNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxRadioButtonNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxBitmapRadioButtonNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxScrollBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxSliderNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxStaticNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlWindowNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxVirtListBoxNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxButtonBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxEnhDialogNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxGetTextFromUserPromptStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorPromptStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorDefaultWildcardStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxInternalErrorStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxFatalErrorStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxTreeCtrlNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogDefaultFolderStr;
+
+//
+// Class names
+//
+WXDLLEXPORT_DATA(extern const wxChar*)  wxFrameClassName;
+WXDLLEXPORT_DATA(extern const wxChar*)  wxFrameClassNameNoRedraw;
+WXDLLEXPORT_DATA(extern const wxChar*)  wxMDIFrameClassName;
+WXDLLEXPORT_DATA(extern const wxChar*)  wxMDIFrameClassNameNoRedraw;
+WXDLLEXPORT_DATA(extern const wxChar*)  wxMDIChildFrameClassName;
+WXDLLEXPORT_DATA(extern const wxChar*)  wxMDIChildFrameClassNameNoRedraw;
+WXDLLEXPORT_DATA(extern const wxChar*)  wxPanelClassName;
+WXDLLEXPORT_DATA(extern const wxChar*)  wxPanelClassNameNR;
+WXDLLEXPORT_DATA(extern const wxChar*)  wxCanvasClassName;
+WXDLLEXPORT_DATA(extern const wxChar*)  wxCanvasClassNameNR;
+
 // ---------------------------------------------------------------------------
 // standard icons from the resources
 // ---------------------------------------------------------------------------
diff --git a/include/wx/os2/radiobox.h b/include/wx/os2/radiobox.h
index d6fe35c359..2e0f9af62f 100644
--- a/include/wx/os2/radiobox.h
+++ b/include/wx/os2/radiobox.h
@@ -12,8 +12,6 @@
 #ifndef _WX_RADIOBOX_H_
 #define _WX_RADIOBOX_H_
 
-WXDLLEXPORT_DATA(extern const char*) wxRadioBoxNameStr;
-
 // List box item
 class WXDLLEXPORT wxBitmap ;
 
diff --git a/include/wx/os2/radiobut.h b/include/wx/os2/radiobut.h
index 8d23a64bcb..054d7f71cd 100644
--- a/include/wx/os2/radiobut.h
+++ b/include/wx/os2/radiobut.h
@@ -14,8 +14,6 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxRadioButtonNameStr;
-
 class WXDLLEXPORT wxRadioButton: public wxControl
 {
 public:
diff --git a/include/wx/os2/scrolbar.h b/include/wx/os2/scrolbar.h
index c7798d1529..9d0c867ae5 100644
--- a/include/wx/os2/scrolbar.h
+++ b/include/wx/os2/scrolbar.h
@@ -14,8 +14,6 @@
 
 #include "wx/scrolbar.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxScrollBarNameStr;
-
 // Scrollbar item
 class WXDLLEXPORT wxScrollBar: public wxScrollBarBase
 {
diff --git a/include/wx/os2/slider.h b/include/wx/os2/slider.h
index 782436634e..e3f6f87fa5 100644
--- a/include/wx/os2/slider.h
+++ b/include/wx/os2/slider.h
@@ -14,8 +14,6 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxSliderNameStr;
-
 // Slider
 class WXDLLEXPORT wxSlider: public wxSliderBase
 {
diff --git a/include/wx/os2/statbmp.h b/include/wx/os2/statbmp.h
index bc7d4e58fc..f42b488f46 100644
--- a/include/wx/os2/statbmp.h
+++ b/include/wx/os2/statbmp.h
@@ -19,8 +19,6 @@
 #include "wx/control.h"
 #include "wx/icon.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr;
-
 class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase
 {
  public:
diff --git a/include/wx/os2/statbox.h b/include/wx/os2/statbox.h
index 1b4fface6e..ac327c6180 100644
--- a/include/wx/os2/statbox.h
+++ b/include/wx/os2/statbox.h
@@ -14,8 +14,6 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxStaticBoxNameStr;
-
 // Group box
 class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase
 {
diff --git a/include/wx/os2/stattext.h b/include/wx/os2/stattext.h
index 9840a9090c..b061ae950f 100644
--- a/include/wx/os2/stattext.h
+++ b/include/wx/os2/stattext.h
@@ -18,8 +18,6 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxStaticTextNameStr;
-
 class WXDLLEXPORT wxStaticText : public wxStaticTextBase
 {
 public:
diff --git a/include/wx/os2/toolbar.h b/include/wx/os2/toolbar.h
index a07398667a..566bbb530a 100644
--- a/include/wx/os2/toolbar.h
+++ b/include/wx/os2/toolbar.h
@@ -15,8 +15,6 @@
 #if wxUSE_TOOLBAR
 #include "wx/tbarbase.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
-
 class WXDLLEXPORT wxToolBar: public wxToolBarBase
 {
 public: