Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2011-02-22 13:25:30 +00:00
parent 9698902019
commit 4add61fd8b
8 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/gtk/tglbtn.h
View File

@@ -22,12 +22,6 @@
class WXDLLIMPEXP_FWD_CORE wxToggleButton; class WXDLLIMPEXP_FWD_CORE wxToggleButton;
class WXDLLIMPEXP_FWD_CORE wxToggleBitmapButton; class WXDLLIMPEXP_FWD_CORE wxToggleBitmapButton;
//-----------------------------------------------------------------------------
// global data
//-----------------------------------------------------------------------------
extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[];
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxBitmapToggleButton // wxBitmapToggleButton
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

6
include/wx/gtk1/tglbtn.h
View File

@@ -22,12 +22,6 @@
class WXDLLIMPEXP_FWD_CORE wxToggleButton; class WXDLLIMPEXP_FWD_CORE wxToggleButton;
class WXDLLIMPEXP_FWD_CORE wxToggleBitmapButton; class WXDLLIMPEXP_FWD_CORE wxToggleBitmapButton;
//-----------------------------------------------------------------------------
// global data
//-----------------------------------------------------------------------------
extern WXDLLIMPEXP_CORE const char wxCheckBoxNameStr[];
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxToggleBitmapButton // wxToggleBitmapButton
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

2
include/wx/msw/tglbtn.h
View File

@@ -15,8 +15,6 @@
#include "wx/bitmap.h" #include "wx/bitmap.h"
extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[];
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxBitmapToggleButton // wxBitmapToggleButton
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

2
include/wx/os2/tglbtn.h
View File

@@ -13,8 +13,6 @@
#ifndef _WX_TOGGLEBUTTON_H_ #ifndef _WX_TOGGLEBUTTON_H_
#define _WX_TOGGLEBUTTON_H_ #define _WX_TOGGLEBUTTON_H_
extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[];
// Checkbox item (single checkbox) // Checkbox item (single checkbox)
class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase
{ {

3
include/wx/osx/tglbtn.h
View File

@@ -13,9 +13,6 @@
#ifndef _WX_TOGGLEBUTTON_H_ #ifndef _WX_TOGGLEBUTTON_H_
#define _WX_TOGGLEBUTTON_H_ #define _WX_TOGGLEBUTTON_H_
WXDLLIMPEXP_DATA_CORE(extern const char) wxCheckBoxNameStr[];
class WXDLLIMPEXP_CORE wxBitmapToggleButton : public wxToggleButtonBase class WXDLLIMPEXP_CORE wxBitmapToggleButton : public wxToggleButtonBase
{ {
public: public:

1
include/wx/palmos/tglbtn.h
View File

@@ -14,7 +14,6 @@
#define _WX_TOGGLEBUTTON_H_ #define _WX_TOGGLEBUTTON_H_
#include "wx/checkbox.h" // wxCheckBoxNameStr, in datacmn.cpp #include "wx/checkbox.h" // wxCheckBoxNameStr, in datacmn.cpp
//WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxCheckBoxNameStr[];
// Checkbox item (single checkbox) // Checkbox item (single checkbox)
class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase

2
include/wx/tglbtn.h
View File

@@ -20,6 +20,8 @@
#include "wx/event.h" #include "wx/event.h"
#include "wx/control.h" // base class #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 );
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

2
include/wx/univ/tglbtn.h
View File

@@ -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
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------