Remove duplicated control names strings declarations from wxOSX.
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:
parent
4add61fd8b
commit
58d424d7e1
@ -30,7 +30,5 @@ public:
|
||||
int GetCommand( wxKeyEvent &event );
|
||||
};
|
||||
|
||||
// WXDLLIMPEXP_DATA_CORE(extern wxAcceleratorTable) wxNullAcceleratorTable;
|
||||
|
||||
#endif
|
||||
// _WX_ACCEL_H_
|
||||
|
@ -17,8 +17,6 @@
|
||||
#include "wx/dynarray.h"
|
||||
#include "wx/arrstr.h"
|
||||
|
||||
WXDLLIMPEXP_DATA_CORE(extern const char) wxChoiceNameStr[];
|
||||
|
||||
WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ;
|
||||
|
||||
// Choice item
|
||||
|
@ -16,8 +16,6 @@
|
||||
#include "wx/choice.h"
|
||||
#include "wx/textctrl.h"
|
||||
|
||||
WXDLLIMPEXP_DATA_CORE(extern const char) wxComboBoxNameStr[];
|
||||
|
||||
WX_DEFINE_ARRAY( char * , wxComboBoxDataArray ) ;
|
||||
|
||||
// forward declaration of private implementation classes
|
||||
|
@ -14,8 +14,6 @@
|
||||
|
||||
#include "wx/panel.h"
|
||||
|
||||
WXDLLIMPEXP_DATA_CORE(extern const char) wxDialogNameStr[];
|
||||
|
||||
class WXDLLIMPEXP_FWD_CORE wxMacToolTip ;
|
||||
class WXDLLIMPEXP_FWD_CORE wxModalEventLoop ;
|
||||
|
||||
|
@ -12,15 +12,10 @@
|
||||
#ifndef _WX_FRAME_H_
|
||||
#define _WX_FRAME_H_
|
||||
|
||||
#include "wx/window.h"
|
||||
#include "wx/toolbar.h"
|
||||
#include "wx/accel.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_CORE wxFrame: public wxFrameBase
|
||||
|
@ -14,8 +14,6 @@
|
||||
|
||||
#include "wx/control.h"
|
||||
|
||||
WXDLLIMPEXP_DATA_CORE(extern const char) wxGaugeNameStr[];
|
||||
|
||||
// Group box
|
||||
class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase
|
||||
{
|
||||
|
@ -16,8 +16,6 @@
|
||||
#include "wx/slider.h"
|
||||
#include "wx/stattext.h"
|
||||
|
||||
WXDLLIMPEXP_DATA_CORE(extern const char) wxSliderNameStr[];
|
||||
|
||||
// Slider
|
||||
class WXDLLIMPEXP_CORE wxSlider: public wxSliderBase
|
||||
{
|
||||
|
@ -14,8 +14,6 @@
|
||||
|
||||
#include "wx/control.h"
|
||||
|
||||
WXDLLIMPEXP_DATA_CORE(extern const char) wxStaticBoxNameStr[];
|
||||
|
||||
// Group box
|
||||
class WXDLLIMPEXP_CORE wxStaticBox: public wxControl
|
||||
{
|
||||
|
@ -17,8 +17,6 @@
|
||||
#include "wx/tbarbase.h"
|
||||
#include "wx/dynarray.h"
|
||||
|
||||
WXDLLIMPEXP_DATA_CORE(extern const char) wxToolBarNameStr[];
|
||||
|
||||
class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxToolBar)
|
||||
|
Loading…
Reference in New Issue
Block a user