From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 22 Feb 2011 13:25:30 +0000 (+0000)
Subject: Move wxCheckBoxNameStr declarations to wx/tglbtn.h from wx/port/tglbtn.h.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4add61fd8b7e56adeb912503c67f4cf1a4065e79?ds=inline

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 3b7ec00123..0886c2dcc4 100644
--- 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;
 
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[];
-
 //-----------------------------------------------------------------------------
 // wxBitmapToggleButton
 //-----------------------------------------------------------------------------
diff --git a/include/wx/gtk1/tglbtn.h b/include/wx/gtk1/tglbtn.h
index d9233c88a9..708cdd3292 100644
--- 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;
 
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern WXDLLIMPEXP_CORE const char wxCheckBoxNameStr[];
-
 //-----------------------------------------------------------------------------
 // wxToggleBitmapButton
 //-----------------------------------------------------------------------------
diff --git a/include/wx/msw/tglbtn.h b/include/wx/msw/tglbtn.h
index cc01baf6de..5a2984fb13 100644
--- a/include/wx/msw/tglbtn.h
+++ b/include/wx/msw/tglbtn.h
@@ -15,8 +15,6 @@
 
 #include "wx/bitmap.h"
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[];
-
 //-----------------------------------------------------------------------------
 // wxBitmapToggleButton
 //-----------------------------------------------------------------------------
diff --git a/include/wx/os2/tglbtn.h b/include/wx/os2/tglbtn.h
index 23e7ce5a7c..8c72a5ac41 100644
--- a/include/wx/os2/tglbtn.h
+++ b/include/wx/os2/tglbtn.h
@@ -13,8 +13,6 @@
 #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
 {
diff --git a/include/wx/osx/tglbtn.h b/include/wx/osx/tglbtn.h
index 63a3c0028f..1782efd829 100644
--- a/include/wx/osx/tglbtn.h
+++ b/include/wx/osx/tglbtn.h
@@ -13,9 +13,6 @@
 #ifndef _WX_TOGGLEBUTTON_H_
 #define _WX_TOGGLEBUTTON_H_
 
-WXDLLIMPEXP_DATA_CORE(extern const char) wxCheckBoxNameStr[];
-
-
 class WXDLLIMPEXP_CORE wxBitmapToggleButton : public wxToggleButtonBase
 {
 public:
diff --git a/include/wx/palmos/tglbtn.h b/include/wx/palmos/tglbtn.h
index 586adefdca..def85cdf5d 100644
--- 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
-//WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxCheckBoxNameStr[];
 
 // Checkbox item (single checkbox)
 class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase
diff --git a/include/wx/tglbtn.h b/include/wx/tglbtn.h
index 25c4d10bc4..bf455bf31a 100644
--- a/include/wx/tglbtn.h
+++ b/include/wx/tglbtn.h
@@ -20,6 +20,8 @@
 #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 );
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/univ/tglbtn.h b/include/wx/univ/tglbtn.h
index 7bb99bac8d..c4d9e5b0d7 100644
--- a/include/wx/univ/tglbtn.h
+++ b/include/wx/univ/tglbtn.h
@@ -14,8 +14,6 @@
 
 #include "wx/button.h"
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[];
-
 // ----------------------------------------------------------------------------
 // wxToggleButton: a push button
 // ----------------------------------------------------------------------------