Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed redundant wx<Control>NameStr declarations.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-05-12 19:52:43 +00:00
parent 22a746d726
commit 0cc1d4ff2a
16 changed files with 2 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/dialog.h
View File

@@ -20,6 +20,8 @@
#include "wx/containr.h" #include "wx/containr.h"
#include "wx/toplevel.h" #include "wx/toplevel.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow
{ {
public: public:

2
include/wx/motif/bmpbuttn.h
View File

@@ -18,8 +18,6 @@
#include "wx/motif/bmpmotif.h" #include "wx/motif/bmpmotif.h"
WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
#define wxDEFAULT_BUTTON_MARGIN 4 #define wxDEFAULT_BUTTON_MARGIN 4
class WXDLLEXPORT wxBitmapButton: public wxBitmapButtonBase class WXDLLEXPORT wxBitmapButton: public wxBitmapButtonBase

2
include/wx/motif/button.h
View File

@@ -16,8 +16,6 @@
#pragma interface "button.h" #pragma interface "button.h"
#endif #endif
WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
// Pushbutton // Pushbutton
class WXDLLEXPORT wxButton: public wxButtonBase class WXDLLEXPORT wxButton: public wxButtonBase
{ {

2
include/wx/motif/checkbox.h
View File

@@ -18,8 +18,6 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const char*) wxCheckBoxNameStr;
// Checkbox item (single checkbox) // Checkbox item (single checkbox)
class WXDLLEXPORT wxCheckBox: public wxCheckBoxBase class WXDLLEXPORT wxCheckBox: public wxCheckBoxBase
{ {

2
include/wx/motif/choice.h
View File

@@ -16,8 +16,6 @@
#pragma interface "choice.h" #pragma interface "choice.h"
#endif #endif
WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
#include "wx/clntdata.h" #include "wx/clntdata.h"
#include "wx/dynarray.h" #include "wx/dynarray.h"

3
include/wx/motif/combobox.h
View File

@@ -18,9 +18,6 @@
#include "wx/choice.h" #include "wx/choice.h"
WXDLLEXPORT_DATA(extern const char*) wxComboBoxNameStr;
WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
// Combobox item // Combobox item
class WXDLLEXPORT wxComboBox: public wxChoice class WXDLLEXPORT wxComboBox: public wxChoice
{ {

2
include/wx/motif/dialog.h
View File

@@ -16,8 +16,6 @@
#pragma interface "dialog.h" #pragma interface "dialog.h"
#endif #endif
WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
class WXDLLEXPORT wxEventLoop; class WXDLLEXPORT wxEventLoop;
// Dialog boxes // Dialog boxes

2
include/wx/motif/gauge.h
View File

@@ -16,8 +16,6 @@
#pragma interface "gauge.h" #pragma interface "gauge.h"
#endif #endif
WXDLLEXPORT_DATA(extern const char*) wxGaugeNameStr;
// Group box // Group box
class WXDLLEXPORT wxGauge : public wxGaugeBase class WXDLLEXPORT wxGauge : public wxGaugeBase
{ {

4
include/wx/motif/listbox.h
View File

@@ -19,13 +19,9 @@
#include "wx/ctrlsub.h" #include "wx/ctrlsub.h"
#include "wx/clntdata.h" #include "wx/clntdata.h"
WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;
// forward decl for GetSelections() // forward decl for GetSelections()
class WXDLLEXPORT wxArrayInt; class WXDLLEXPORT wxArrayInt;
WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
// List box item // List box item
class WXDLLEXPORT wxListBox: public wxListBoxBase class WXDLLEXPORT wxListBox: public wxListBoxBase
{ {

3
include/wx/motif/mdi.h
View File

@@ -27,9 +27,6 @@ but wxMDIChildFrame::GetParent should return the parent frame.
#include "wx/frame.h" #include "wx/frame.h"
#include "wx/notebook.h" #include "wx/notebook.h"
WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr;
WXDLLEXPORT_DATA(extern const char*) wxStatusLineNameStr;
class WXDLLEXPORT wxMDIClientWindow; class WXDLLEXPORT wxMDIClientWindow;
class WXDLLEXPORT wxMDIChildFrame; class WXDLLEXPORT wxMDIChildFrame;

2
include/wx/motif/radiobox.h
View File

@@ -18,8 +18,6 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const char*) wxRadioBoxNameStr;
// List box item // List box item
class WXDLLEXPORT wxBitmap ; class WXDLLEXPORT wxBitmap ;

38
include/wx/motif/radiobut.h
View File

@@ -18,8 +18,6 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const char*) wxRadioButtonNameStr;
class WXDLLEXPORT wxRadioButton: public wxControl class WXDLLEXPORT wxRadioButton: public wxControl
{ {
DECLARE_DYNAMIC_CLASS(wxRadioButton) DECLARE_DYNAMIC_CLASS(wxRadioButton)
@@ -67,41 +65,5 @@ private:
wxRadioButton *m_cycle; 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 #endif
// _WX_RADIOBUT_H_ // _WX_RADIOBUT_H_

2
include/wx/motif/scrolbar.h
View File

@@ -18,8 +18,6 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const char*) wxScrollBarNameStr;
// Scrollbar item // Scrollbar item
class WXDLLEXPORT wxScrollBar: public wxControl class WXDLLEXPORT wxScrollBar: public wxControl
{ {

2
include/wx/motif/slider.h
View File

@@ -18,8 +18,6 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const char*) wxSliderNameStr;
// Slider // Slider
class WXDLLEXPORT wxSlider: public wxSliderBase class WXDLLEXPORT wxSlider: public wxSliderBase
{ {

2
include/wx/motif/statbox.h
View File

@@ -16,8 +16,6 @@
#pragma interface "statbox.h" #pragma interface "statbox.h"
#endif #endif
WXDLLEXPORT_DATA(extern const char*) wxStaticBoxNameStr;
// Group box // Group box
class WXDLLEXPORT wxStaticBox: public wxStaticBoxBase class WXDLLEXPORT wxStaticBox: public wxStaticBoxBase
{ {

1
include/wx/motif/textctrl.h
View File

@@ -16,7 +16,6 @@
#pragma interface "textctrl.h" #pragma interface "textctrl.h"
#endif #endif
WXDLLEXPORT_DATA(extern const char*) wxTextCtrlNameStr;
WXDLLEXPORT_DATA(extern const char*) wxEmptyString; WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
// Single-line text item // Single-line text item