From 0cc1d4ff2a0c78666f35bbfa34fcc609d7862709 Mon Sep 17 00:00:00 2001 From: Mattia Barbon Date: Mon, 12 May 2003 19:52:43 +0000 Subject: [PATCH] Removed redundant wxNameStr declarations. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dialog.h | 2 ++ include/wx/motif/bmpbuttn.h | 2 -- include/wx/motif/button.h | 2 -- include/wx/motif/checkbox.h | 2 -- include/wx/motif/choice.h | 2 -- include/wx/motif/combobox.h | 3 --- include/wx/motif/dialog.h | 2 -- include/wx/motif/gauge.h | 2 -- include/wx/motif/listbox.h | 4 ---- include/wx/motif/mdi.h | 3 --- include/wx/motif/radiobox.h | 2 -- include/wx/motif/radiobut.h | 38 ------------------------------------- include/wx/motif/scrolbar.h | 2 -- include/wx/motif/slider.h | 2 -- include/wx/motif/statbox.h | 2 -- include/wx/motif/textctrl.h | 1 - 16 files changed, 2 insertions(+), 69 deletions(-) diff --git a/include/wx/dialog.h b/include/wx/dialog.h index e1afd445d9..319e891aec 100644 --- 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 84df78e5c2..b70b1bf6dd 100644 --- 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 0389589398..d9bb8faedc 100644 --- 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 94a504384a..397fff2e11 100644 --- 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 8d1a30846e..e2ce50b03c 100644 --- 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 b203dcb775..cbe6c90819 100644 --- 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 f80406c514..65f3ed28f4 100644 --- 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 2a05ba8cb7..be736436b9 100644 --- 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 1e1907e243..ae350046c3 100644 --- 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 f639f55161..8130198732 100644 --- 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 7f27104b40..56705a5780 100644 --- 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 d7e76e904a..574aab83d1 100644 --- 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 3c274df7b3..954c21795f 100644 --- 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 6ad6bab1b1..7da780dec0 100644 --- 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 e5821c11ed..eca2ce40f8 100644 --- 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 3b3aadd41f..4aeec5e504 100644 --- 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 -- 2.47.2