Move wxCheckBoxNameStr declarations to wx/tglbtn.h from wx/port/tglbtn.h.

Don't duplicate wxCheckBoxNameStr declarations in all ports.

Of course, the question still remains why does wxToggleButton use
wxCheckBoxNameStr and not a specific name in the first place.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/tglbtn.h b/include/wx/gtk/tglbtn.h
index 3b7ec0012377d9f608d87eef0f3bf41091edc38f..0886c2dcc42cce187117808dbe3bc267166ad7ed 100644 (file)
--- a/include/wx/gtk/tglbtn.h
+++ b/include/wx/gtk/tglbtn.h
@@ -22,12 +22,6 @@
 class WXDLLIMPEXP_FWD_CORE wxToggleButton;
 class WXDLLIMPEXP_FWD_CORE wxToggleBitmapButton;
 
 class WXDLLIMPEXP_FWD_CORE wxToggleButton;
 class WXDLLIMPEXP_FWD_CORE wxToggleBitmapButton;
 

-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[];
-

 //-----------------------------------------------------------------------------
 // wxBitmapToggleButton
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxBitmapToggleButton
 //-----------------------------------------------------------------------------

diff --git a/include/wx/gtk1/tglbtn.h b/include/wx/gtk1/tglbtn.h
index d9233c88a9b2957818b5f2f5daf473aec526438e..708cdd3292794aa70ca0746519237c12b2e9b7f4 100644 (file)
--- a/include/wx/gtk1/tglbtn.h
+++ b/include/wx/gtk1/tglbtn.h
@@ -22,12 +22,6 @@
 class WXDLLIMPEXP_FWD_CORE wxToggleButton;
 class WXDLLIMPEXP_FWD_CORE wxToggleBitmapButton;
 
 class WXDLLIMPEXP_FWD_CORE wxToggleButton;
 class WXDLLIMPEXP_FWD_CORE wxToggleBitmapButton;
 

-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern WXDLLIMPEXP_CORE const char wxCheckBoxNameStr[];
-

 //-----------------------------------------------------------------------------
 // wxToggleBitmapButton
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxToggleBitmapButton
 //-----------------------------------------------------------------------------

diff --git a/include/wx/msw/tglbtn.h b/include/wx/msw/tglbtn.h
index cc01baf6de47c53a42c66870cd0adb9557449d71..5a2984fb138baa67bd23038bdd2e8f3affd532a1 100644 (file)
--- a/include/wx/msw/tglbtn.h
+++ b/include/wx/msw/tglbtn.h
@@ -15,8 +15,6 @@
 
 #include "wx/bitmap.h"
 
 
 #include "wx/bitmap.h"
 

-extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[];
-

 //-----------------------------------------------------------------------------
 // wxBitmapToggleButton
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxBitmapToggleButton
 //-----------------------------------------------------------------------------

diff --git a/include/wx/os2/tglbtn.h b/include/wx/os2/tglbtn.h
index 23e7ce5a7c6862744b86ae8310fa99f054f30a76..8c72a5ac4195205dc5e45d2602f07f04f39f4c5b 100644 (file)
--- a/include/wx/os2/tglbtn.h
+++ b/include/wx/os2/tglbtn.h
@@ -13,8 +13,6 @@
 #ifndef _WX_TOGGLEBUTTON_H_
 #define _WX_TOGGLEBUTTON_H_
 
 #ifndef _WX_TOGGLEBUTTON_H_
 #define _WX_TOGGLEBUTTON_H_
 

-extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[];
-

 // Checkbox item (single checkbox)
 class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase
 {
 // Checkbox item (single checkbox)
 class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase
 {

diff --git a/include/wx/osx/tglbtn.h b/include/wx/osx/tglbtn.h
index 63a3c0028f0c2bbd79ec6d9e77d9a98ddb1993a7..1782efd8296927a3df257504a9a2663e61eb44f0 100644 (file)
--- a/include/wx/osx/tglbtn.h
+++ b/include/wx/osx/tglbtn.h
@@ -13,9 +13,6 @@
 #ifndef _WX_TOGGLEBUTTON_H_
 #define _WX_TOGGLEBUTTON_H_
 
 #ifndef _WX_TOGGLEBUTTON_H_
 #define _WX_TOGGLEBUTTON_H_
 

-WXDLLIMPEXP_DATA_CORE(extern const char) wxCheckBoxNameStr[];
-
-

 class WXDLLIMPEXP_CORE wxBitmapToggleButton : public wxToggleButtonBase
 {
 public:
 class WXDLLIMPEXP_CORE wxBitmapToggleButton : public wxToggleButtonBase
 {
 public:

diff --git a/include/wx/palmos/tglbtn.h b/include/wx/palmos/tglbtn.h
index 586adefdcafb7bc3fe0eb21fd3c682693d5f08a7..def85cdf5d8f9fe548161b968d0d46270d1b5cc6 100644 (file)
--- a/include/wx/palmos/tglbtn.h
+++ b/include/wx/palmos/tglbtn.h
@@ -14,7 +14,6 @@
 #define _WX_TOGGLEBUTTON_H_
 
 #include "wx/checkbox.h" // wxCheckBoxNameStr, in datacmn.cpp
 #define _WX_TOGGLEBUTTON_H_
 
 #include "wx/checkbox.h" // wxCheckBoxNameStr, in datacmn.cpp

-//WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxCheckBoxNameStr[];

 
 // Checkbox item (single checkbox)
 class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase
 
 // Checkbox item (single checkbox)
 class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase

diff --git a/include/wx/tglbtn.h b/include/wx/tglbtn.h
index 25c4d10bc43a6636e30964e735cc0cf4861a12b7..bf455bf31a83fd9de734ac5b90d82a04b3bcece6 100644 (file)
--- a/include/wx/tglbtn.h
+++ b/include/wx/tglbtn.h
@@ -20,6 +20,8 @@
 #include "wx/event.h"
 #include "wx/control.h"     // base class
 
 #include "wx/event.h"
 #include "wx/control.h"     // base class
 

+extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[];
+

 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent );
 
 // ----------------------------------------------------------------------------
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent );
 
 // ----------------------------------------------------------------------------

diff --git a/include/wx/univ/tglbtn.h b/include/wx/univ/tglbtn.h
index 7bb99bac8d3a37bb9a8ad4d1d190c1730d6f6c03..c4d9e5b0d720059e99a32d280a16bcaf93e5373f 100644 (file)
--- a/include/wx/univ/tglbtn.h
+++ b/include/wx/univ/tglbtn.h
@@ -14,8 +14,6 @@
 
 #include "wx/button.h"
 
 
 #include "wx/button.h"
 

-extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[];
-

 // ----------------------------------------------------------------------------
 // wxToggleButton: a push button
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxToggleButton: a push button
 // ----------------------------------------------------------------------------