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

diff --git a/include/wx/osx/accel.h b/include/wx/osx/accel.h
index 5a81d61840011f8dca1b054352c4404f8e297039..9434e19f6d1631b7c8237ba846cf637ad1948bfb 100644 (file)
--- a/include/wx/osx/accel.h
+++ b/include/wx/osx/accel.h
@@ -30,7 +30,5 @@ public:
     int GetCommand( wxKeyEvent &event );
 };
 
-// WXDLLIMPEXP_DATA_CORE(extern wxAcceleratorTable) wxNullAcceleratorTable;
-
 #endif
     // _WX_ACCEL_H_

diff --git a/include/wx/osx/choice.h b/include/wx/osx/choice.h
index e6c49aada957aae7070c95d4fcbbe6ad088000c4..3e8898373c63d40c2b7273d9fb2e2237615a9179 100644 (file)
--- a/include/wx/osx/choice.h
+++ b/include/wx/osx/choice.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

diff --git a/include/wx/osx/combobox.h b/include/wx/osx/combobox.h
index 487f9a6c67d5ffa55a4b0c9c8cfc614f2755e2db..d8e5c186e4442bb69d625527c05a63348ba0d3b3 100644 (file)
--- a/include/wx/osx/combobox.h
+++ b/include/wx/osx/combobox.h
@@ -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

diff --git a/include/wx/osx/dialog.h b/include/wx/osx/dialog.h
index dc82d7cc6dc5600ea03ae7f6de519c7cdbb1bd51..8b7a24f2bd4d986ede83cc51aed07f6459e17795 100644 (file)
--- a/include/wx/osx/dialog.h
+++ b/include/wx/osx/dialog.h
@@ -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 ;
 

diff --git a/include/wx/osx/frame.h b/include/wx/osx/frame.h
index ce38ec90d308da3d288d5c4295ce2bad78f3875b..171fe8ea66800c69ac4095a8882ffd7b29570520 100644 (file)
--- a/include/wx/osx/frame.h
+++ b/include/wx/osx/frame.h
@@ -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

diff --git a/include/wx/osx/gauge.h b/include/wx/osx/gauge.h
index 3db68bebe869ada67af428b6799d234553ae13d8..e5df162c9789ed40aea591d20d85fc441c87d0a8 100644 (file)
--- a/include/wx/osx/gauge.h
+++ b/include/wx/osx/gauge.h
@@ -14,8 +14,6 @@
 
 #include "wx/control.h"
 
-WXDLLIMPEXP_DATA_CORE(extern const char) wxGaugeNameStr[];
-
 // Group box
 class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase
 {

diff --git a/include/wx/osx/slider.h b/include/wx/osx/slider.h
index 851a8eabebeb02fd5046ed49cd7b2db245001338..f85fff7be2f11398ebb8ba327ead59cd72bf40b5 100644 (file)
--- a/include/wx/osx/slider.h
+++ b/include/wx/osx/slider.h
@@ -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
 {

diff --git a/include/wx/osx/statbox.h b/include/wx/osx/statbox.h
index ccd66cab4259ccb6d357a1a27ae632846107ed7a..429cc1fd9d3a04d895517dac400d1da78caf84d1 100644 (file)
--- a/include/wx/osx/statbox.h
+++ b/include/wx/osx/statbox.h
@@ -14,8 +14,6 @@
 
 #include "wx/control.h"
 
-WXDLLIMPEXP_DATA_CORE(extern const char) wxStaticBoxNameStr[];
-
 // Group box
 class WXDLLIMPEXP_CORE wxStaticBox: public wxControl
 {

diff --git a/include/wx/osx/toolbar.h b/include/wx/osx/toolbar.h
index 553b70d6d36fbe7916d8bc2d24b3b7647961c076..f8d789ec3551e9bc2410dd2c642d82e6b20fcf3b 100644 (file)
--- a/include/wx/osx/toolbar.h
+++ b/include/wx/osx/toolbar.h
@@ -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)