Removed redundant wx<Control>NameStr declarations.

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

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index e1afd445d9e6ab106601d525fade717bed9505b4..319e891aec5f72599bb3888238ebf407229b9684 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -20,6 +20,8 @@
 #include "wx/containr.h"
 #include "wx/toplevel.h"
 
+WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
+
 class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow
 {
 public:

diff --git a/include/wx/motif/bmpbuttn.h b/include/wx/motif/bmpbuttn.h
index 84df78e5c2df6f3380744692b3bdf973acaf43b3..b70b1bf6dda91767f573cc3315f55724b0875e71 100644 (file)
--- a/include/wx/motif/bmpbuttn.h
+++ b/include/wx/motif/bmpbuttn.h
@@ -18,8 +18,6 @@
 
 #include "wx/motif/bmpmotif.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
-
 #define wxDEFAULT_BUTTON_MARGIN 4
 
 class WXDLLEXPORT wxBitmapButton: public wxBitmapButtonBase

diff --git a/include/wx/motif/button.h b/include/wx/motif/button.h
index 03895893987d31ad76232ca4b86fd3399d533f6b..d9bb8faedc4b63be1bac1368046e9e8ede362aae 100644 (file)
--- a/include/wx/motif/button.h
+++ b/include/wx/motif/button.h
@@ -16,8 +16,6 @@
 #pragma interface "button.h"
 #endif
 
-WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
-
 // Pushbutton
 class WXDLLEXPORT wxButton: public wxButtonBase
 {

diff --git a/include/wx/motif/checkbox.h b/include/wx/motif/checkbox.h
index 94a504384a20e7c8186a55c2eac08c2c3496af18..397fff2e11a979323291d8c6f97b40a41fa357d5 100644 (file)
--- a/include/wx/motif/checkbox.h
+++ b/include/wx/motif/checkbox.h
@@ -18,8 +18,6 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxCheckBoxNameStr;
-
 // Checkbox item (single checkbox)
 class WXDLLEXPORT wxCheckBox: public wxCheckBoxBase
 {

diff --git a/include/wx/motif/choice.h b/include/wx/motif/choice.h
index 8d1a30846e42e44b32d11466d5a0c0d9cf651ecf..e2ce50b03cc152c2d851fa44c9bea971ac650248 100644 (file)
--- a/include/wx/motif/choice.h
+++ b/include/wx/motif/choice.h
@@ -16,8 +16,6 @@
 #pragma interface "choice.h"
 #endif
 
-WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
-
 #include "wx/clntdata.h"
 #include "wx/dynarray.h"
 

diff --git a/include/wx/motif/combobox.h b/include/wx/motif/combobox.h
index b203dcb7751af516d32dd85ddf90d789934e1e80..cbe6c908193c0a6d1947517c78bbf94c028425de 100644 (file)
--- a/include/wx/motif/combobox.h
+++ b/include/wx/motif/combobox.h
@@ -18,9 +18,6 @@
 
 #include "wx/choice.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxComboBoxNameStr;
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
-
 // Combobox item
 class WXDLLEXPORT wxComboBox: public wxChoice
 {

diff --git a/include/wx/motif/dialog.h b/include/wx/motif/dialog.h
index f80406c5149159ac533f1e9511c4873f3a503338..65f3ed28f44f7ffd45176d95ec4b8b4651c9055d 100644 (file)
--- a/include/wx/motif/dialog.h
+++ b/include/wx/motif/dialog.h
@@ -16,8 +16,6 @@
 #pragma interface "dialog.h"
 #endif
 
-WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
-
 class WXDLLEXPORT wxEventLoop;
 
 // Dialog boxes

diff --git a/include/wx/motif/gauge.h b/include/wx/motif/gauge.h
index 2a05ba8cb7ba2578c83b9fc0bf8e39cd4ac52993..be736436b9fad346ae74d8d2c8d126e304264a8a 100644 (file)
--- a/include/wx/motif/gauge.h
+++ b/include/wx/motif/gauge.h
@@ -16,8 +16,6 @@
 #pragma interface "gauge.h"
 #endif
 
-WXDLLEXPORT_DATA(extern const char*) wxGaugeNameStr;
-
 // Group box
 class WXDLLEXPORT wxGauge : public wxGaugeBase
 {

diff --git a/include/wx/motif/listbox.h b/include/wx/motif/listbox.h
index 1e1907e24382d24d681bd7a5be7b43eba34c2565..ae350046c3038062b02191a19c57205eef006974 100644 (file)
--- a/include/wx/motif/listbox.h
+++ b/include/wx/motif/listbox.h
@@ -19,13 +19,9 @@
 #include "wx/ctrlsub.h"
 #include "wx/clntdata.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;
-
 // forward decl for GetSelections()
 class WXDLLEXPORT wxArrayInt;
 
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
-
 // List box item
 class WXDLLEXPORT wxListBox: public wxListBoxBase
 {

diff --git a/include/wx/motif/mdi.h b/include/wx/motif/mdi.h
index f639f551613c1d7f7cc05bb20f5b409637ae84a6..8130198732ca9b76462951bf122989b3edf0f55d 100644 (file)
--- a/include/wx/motif/mdi.h
+++ b/include/wx/motif/mdi.h
@@ -27,9 +27,6 @@ but wxMDIChildFrame::GetParent should return the parent frame.
 #include "wx/frame.h"
 #include "wx/notebook.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr;
-WXDLLEXPORT_DATA(extern const char*) wxStatusLineNameStr;
-
 class WXDLLEXPORT wxMDIClientWindow;
 class WXDLLEXPORT wxMDIChildFrame;
 

diff --git a/include/wx/motif/radiobox.h b/include/wx/motif/radiobox.h
index 7f27104b4089f393ed0c490c246ca12d35a6aa75..56705a5780dffcfb3aa296d128e5a1f815a90d7b 100644 (file)
--- a/include/wx/motif/radiobox.h
+++ b/include/wx/motif/radiobox.h
@@ -18,8 +18,6 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxRadioBoxNameStr;
-
 // List box item
 class WXDLLEXPORT wxBitmap ;
 

diff --git a/include/wx/motif/radiobut.h b/include/wx/motif/radiobut.h
index d7e76e904a73f59bebdcf04e3ed1fa55ff938e3a..574aab83d1f57d9dbdf49feeb867ec53b1593d64 100644 (file)
--- a/include/wx/motif/radiobut.h
+++ b/include/wx/motif/radiobut.h
@@ -18,8 +18,6 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxRadioButtonNameStr;
-
 class WXDLLEXPORT wxRadioButton: public wxControl
 {
     DECLARE_DYNAMIC_CLASS(wxRadioButton)
@@ -67,41 +65,5 @@ private:
     wxRadioButton *m_cycle;
 };
 
-// Not implemented
-#if 0
-class WXDLLEXPORT wxBitmap ;
-
-WXDLLEXPORT_DATA(extern const char*) wxBitmapRadioButtonNameStr;
-
-class WXDLLEXPORT wxBitmapRadioButton: public wxRadioButton
-{
-    DECLARE_DYNAMIC_CLASS(wxBitmapRadioButton)
-protected:
-    wxBitmap *theButtonBitmap;
-public:
-    inline wxBitmapRadioButton() { theButtonBitmap = NULL; }
-    inline wxBitmapRadioButton(wxWindow *parent, wxWindowID id,
-        const wxBitmap *label,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxBitmapRadioButtonNameStr)
-    {
-        Create(parent, id, label, pos, size, style, validator, name);
-    }
-    
-    bool Create(wxWindow *parent, wxWindowID id,
-        const wxBitmap *label,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxBitmapRadioButtonNameStr);
-    
-    virtual void SetLabel(const wxBitmap *label);
-    virtual void SetValue(bool val) ;
-    virtual bool GetValue() const ;
-};
-#endif
-
 #endif
 // _WX_RADIOBUT_H_

diff --git a/include/wx/motif/scrolbar.h b/include/wx/motif/scrolbar.h
index 3c274df7b37c17a15c4bfb92d1d978bea4c6dbb6..954c21795f77c70d1bce02e5ef2c04d0d39a7106 100644 (file)
--- a/include/wx/motif/scrolbar.h
+++ b/include/wx/motif/scrolbar.h
@@ -18,8 +18,6 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxScrollBarNameStr;
-
 // Scrollbar item
 class WXDLLEXPORT wxScrollBar: public wxControl
 {

diff --git a/include/wx/motif/slider.h b/include/wx/motif/slider.h
index 6ad6bab1b1e5b70f51a133eabd7a37d2396dc664..7da780dec0d34b5f40a7bcb1e0e54058b72f95fb 100644 (file)
--- a/include/wx/motif/slider.h
+++ b/include/wx/motif/slider.h
@@ -18,8 +18,6 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxSliderNameStr;
-
 // Slider
 class WXDLLEXPORT wxSlider: public wxSliderBase
 {

diff --git a/include/wx/motif/statbox.h b/include/wx/motif/statbox.h
index e5821c11ed6f78aaa5454f0cd4c074070cb910f9..eca2ce40f8ae260f98d5162fe87d9c86ade2bec4 100644 (file)
--- a/include/wx/motif/statbox.h
+++ b/include/wx/motif/statbox.h
@@ -16,8 +16,6 @@
 #pragma interface "statbox.h"
 #endif
 
-WXDLLEXPORT_DATA(extern const char*) wxStaticBoxNameStr;
-
 // Group box
 class WXDLLEXPORT wxStaticBox: public wxStaticBoxBase
 {

diff --git a/include/wx/motif/textctrl.h b/include/wx/motif/textctrl.h
index 3b3aadd41f891244d26016d23404d58d555b3ed2..4aeec5e50492a8ab7ed8da8bec74c8562612b813 100644 (file)
--- a/include/wx/motif/textctrl.h
+++ b/include/wx/motif/textctrl.h
@@ -16,7 +16,6 @@
 #pragma interface "textctrl.h"
 #endif
 
-WXDLLEXPORT_DATA(extern const char*) wxTextCtrlNameStr;
 WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
 
 // Single-line text item