From 58d424d7e15e3b1fd88ef0adfe280b006250a54c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 22 Feb 2011 13:25:38 +0000
Subject: [PATCH] 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
---
 include/wx/osx/accel.h    | 2 --
 include/wx/osx/choice.h   | 2 --
 include/wx/osx/combobox.h | 2 --
 include/wx/osx/dialog.h   | 2 --
 include/wx/osx/frame.h    | 5 -----
 include/wx/osx/gauge.h    | 2 --
 include/wx/osx/slider.h   | 2 --
 include/wx/osx/statbox.h  | 2 --
 include/wx/osx/toolbar.h  | 2 --
 9 files changed, 21 deletions(-)

diff --git a/include/wx/osx/accel.h b/include/wx/osx/accel.h
index 5a81d61840..9434e19f6d 100644
--- 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 e6c49aada9..3e8898373c 100644
--- 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 487f9a6c67..d8e5c186e4 100644
--- 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 dc82d7cc6d..8b7a24f2bd 100644
--- 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 ce38ec90d3..171fe8ea66 100644
--- 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 3db68bebe8..e5df162c97 100644
--- 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 851a8eabeb..f85fff7be2 100644
--- 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 ccd66cab42..429cc1fd9d 100644
--- 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 553b70d6d3..f8d789ec35 100644
--- 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)
-- 
2.45.2