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

Remove duplicated control names strings declarations from wxOSX.

Browse Source 
There is no need to declare wxFooNameStr constants in wx/osx/foo.h files as
they are already declared in wx/foo.h.

Also remove a couple of header/forward declarations unnecessary for the same
reason.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-02-22 13:25:38 +00:00
parent 4add61fd8b
commit 58d424d7e1
9 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/osx/accel.h
View File

@@ -30,7 +30,5 @@ public:
int GetCommand( wxKeyEvent &event ); int GetCommand( wxKeyEvent &event );
}; };
// WXDLLIMPEXP_DATA_CORE(extern wxAcceleratorTable) wxNullAcceleratorTable;
#endif #endif
// _WX_ACCEL_H_ // _WX_ACCEL_H_

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

@@ -17,8 +17,6 @@
#include "wx/dynarray.h" #include "wx/dynarray.h"
#include "wx/arrstr.h" #include "wx/arrstr.h"
WXDLLIMPEXP_DATA_CORE(extern const char) wxChoiceNameStr[];
WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ; WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ;
// Choice item // Choice item

2
include/wx/osx/combobox.h
View File

@@ -16,8 +16,6 @@
#include "wx/choice.h" #include "wx/choice.h"
#include "wx/textctrl.h" #include "wx/textctrl.h"
WXDLLIMPEXP_DATA_CORE(extern const char) wxComboBoxNameStr[];
WX_DEFINE_ARRAY( char * , wxComboBoxDataArray ) ; WX_DEFINE_ARRAY( char * , wxComboBoxDataArray ) ;
// forward declaration of private implementation classes // forward declaration of private implementation classes

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

@@ -14,8 +14,6 @@
#include "wx/panel.h" #include "wx/panel.h"
WXDLLIMPEXP_DATA_CORE(extern const char) wxDialogNameStr[];
class WXDLLIMPEXP_FWD_CORE wxMacToolTip ; class WXDLLIMPEXP_FWD_CORE wxMacToolTip ;
class WXDLLIMPEXP_FWD_CORE wxModalEventLoop ; class WXDLLIMPEXP_FWD_CORE wxModalEventLoop ;

5
include/wx/osx/frame.h
View File

@@ -12,15 +12,10 @@
#ifndef _WX_FRAME_H_ #ifndef _WX_FRAME_H_
#define _WX_FRAME_H_ #define _WX_FRAME_H_
#include "wx/window.h"
#include "wx/toolbar.h" #include "wx/toolbar.h"
#include "wx/accel.h" #include "wx/accel.h"
#include "wx/icon.h" #include "wx/icon.h"
WXDLLIMPEXP_DATA_CORE(extern const char) wxToolBarNameStr[];
class WXDLLIMPEXP_FWD_CORE wxMenuBar;
class WXDLLIMPEXP_FWD_CORE wxStatusBar;
class WXDLLIMPEXP_FWD_CORE wxMacToolTip ; class WXDLLIMPEXP_FWD_CORE wxMacToolTip ;
class WXDLLIMPEXP_CORE wxFrame: public wxFrameBase class WXDLLIMPEXP_CORE wxFrame: public wxFrameBase

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

@@ -14,8 +14,6 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLIMPEXP_DATA_CORE(extern const char) wxGaugeNameStr[];
// Group box // Group box
class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase
{ {

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

@@ -16,8 +16,6 @@
#include "wx/slider.h" #include "wx/slider.h"
#include "wx/stattext.h" #include "wx/stattext.h"
WXDLLIMPEXP_DATA_CORE(extern const char) wxSliderNameStr[];
// Slider // Slider
class WXDLLIMPEXP_CORE wxSlider: public wxSliderBase class WXDLLIMPEXP_CORE wxSlider: public wxSliderBase
{ {

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

@@ -14,8 +14,6 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLIMPEXP_DATA_CORE(extern const char) wxStaticBoxNameStr[];
// Group box // Group box
class WXDLLIMPEXP_CORE wxStaticBox: public wxControl class WXDLLIMPEXP_CORE wxStaticBox: public wxControl
{ {

2
include/wx/osx/toolbar.h
View File

@@ -17,8 +17,6 @@
#include "wx/tbarbase.h" #include "wx/tbarbase.h"
#include "wx/dynarray.h" #include "wx/dynarray.h"
WXDLLIMPEXP_DATA_CORE(extern const char) wxToolBarNameStr[];
class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase
{ {
DECLARE_DYNAMIC_CLASS(wxToolBar) DECLARE_DYNAMIC_CLASS(wxToolBar)