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

Move constant strings to .rodata/.data.rel.ro ELF segment from .data by making them really const.

Browse Source 
If any more exotic toolchain decides to not export these strings into the core library anymore, let me know. Try to
compile the notebook sample, for example.
TODO: Move strings not meant for wxCore out of wxCore to the appropriate library.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mart Raudsepp
2006-01-16 14:59:55 +00:00
parent 3dbfe8f44f
commit 63ec432bd7
107 changed files with 198 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/bmpbuttn.h
View File

@@ -19,7 +19,7 @@
#include "wx/bitmap.h" #include "wx/bitmap.h"
#include "wx/button.h" #include "wx/button.h"
extern WXDLLEXPORT_DATA(const wxChar*) wxButtonNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[];
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxBitmapButton: a button which shows bitmaps instead of the usual string. // wxBitmapButton: a button which shows bitmaps instead of the usual string.

2
include/wx/button.h
View File

@@ -47,7 +47,7 @@
class WXDLLEXPORT wxBitmap; class WXDLLEXPORT wxBitmap;
extern WXDLLEXPORT_DATA(const wxChar*) wxButtonNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[];
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxButton: a push button // wxButton: a push button

2
include/wx/checkbox.h
View File

@@ -49,7 +49,7 @@ enum wxCheckBoxState
}; };
extern WXDLLEXPORT_DATA(const wxChar *) wxCheckBoxNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxCheckBoxNameStr[];
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxCheckBox: a control which shows a label and a box which may be checked // wxCheckBox: a control which shows a label and a box which may be checked

2
include/wx/choice.h
View File

@@ -26,7 +26,7 @@
// global data // global data
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
extern WXDLLEXPORT_DATA(const wxChar*) wxChoiceNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxChoiceNameStr[];
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxChoice allows to select one of a non-modifiable list of strings // wxChoice allows to select one of a non-modifiable list of strings

2
include/wx/cocoa/dialog.h
View File

@@ -17,7 +17,7 @@
#include "wx/panel.h" #include "wx/panel.h"
#include "wx/cocoa/NSPanel.h" #include "wx/cocoa/NSPanel.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxDialogNameStr[];
// ======================================================================== // ========================================================================
// wxDialog // wxDialog

2
include/wx/combobox.h
View File

@@ -16,7 +16,7 @@
#if wxUSE_COMBOBOX #if wxUSE_COMBOBOX
extern WXDLLEXPORT_DATA(const wxChar*) wxComboBoxNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[];
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxComboBoxBase: this interface defines the methods wxComboBox must implement // wxComboBoxBase: this interface defines the methods wxComboBox must implement

2
include/wx/control.h
View File

@@ -22,7 +22,7 @@
#include "wx/window.h" // base class #include "wx/window.h" // base class
extern WXDLLEXPORT_DATA(const wxChar*) wxControlNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxControlNameStr[];
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxControl is the base class for all controls // wxControl is the base class for all controls

2
include/wx/dataview.h
View File

@@ -24,7 +24,7 @@
#include "wx/textctrl.h" #include "wx/textctrl.h"
#include "wx/bitmap.h" #include "wx/bitmap.h"
extern WXDLLEXPORT_DATA(const wxChar*) wxDataViewCtrlNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxDataViewCtrlNameStr[];

2
include/wx/dialog.h
View File

@@ -27,7 +27,7 @@ class WXDLLEXPORT wxStdDialogButtonSizer;
#define wxDEFAULT_DIALOG_STYLE (wxCAPTION | wxSYSTEM_MENU | wxCLOSE_BOX) #define wxDEFAULT_DIALOG_STYLE (wxCAPTION | wxSYSTEM_MENU | wxCLOSE_BOX)
#endif #endif
extern WXDLLEXPORT_DATA(const wxChar*) wxDialogNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[];
class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow
{ {

7
include/wx/dirdlg.h
View File

@@ -20,9 +20,10 @@
// constants // constants
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
extern WXDLLEXPORT_DATA(const wxChar*) wxDirDialogNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogNameStr[];
extern WXDLLEXPORT_DATA(const wxChar*) wxDirDialogDefaultFolderStr; extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogDefaultFolderStr[];
extern WXDLLEXPORT_DATA(const wxChar*) wxDirSelectorPromptStr; extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[];
#ifdef __WXWINCE__ #ifdef __WXWINCE__
#define wxDD_DEFAULT_STYLE \ #define wxDD_DEFAULT_STYLE \

4
include/wx/filedlg.h
View File

@@ -36,8 +36,8 @@ enum
wxCHANGE_DIR = 0x0040 wxCHANGE_DIR = 0x0040
}; };
extern WXDLLEXPORT_DATA(const wxChar*) wxFileSelectorPromptStr; extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorPromptStr[];
extern WXDLLEXPORT_DATA(const wxChar*) wxFileSelectorDefaultWildcardStr; extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorDefaultWildcardStr[];
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// wxFileDialogBase // wxFileDialogBase

6
include/wx/frame.h
View File

@@ -19,9 +19,9 @@
#include "wx/toplevel.h" // the base class #include "wx/toplevel.h" // the base class
// the default names for various classs // the default names for various classs
extern WXDLLEXPORT_DATA(const wxChar*) wxFrameNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[];
extern WXDLLEXPORT_DATA(const wxChar*) wxStatusLineNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
extern WXDLLEXPORT_DATA(const wxChar*) wxToolBarNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[];
class WXDLLEXPORT wxFrame; class WXDLLEXPORT wxFrame;
class WXDLLEXPORT wxMenuBar; class WXDLLEXPORT wxMenuBar;

2
include/wx/gauge.h
View File

@@ -32,7 +32,7 @@
#define wxGA_PROGRESSBAR 0 #define wxGA_PROGRESSBAR 0
extern WXDLLEXPORT_DATA(const wxChar*) wxGaugeNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxGaugeNameStr[];
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxGauge: a progress bar // wxGauge: a progress bar

2
include/wx/gdicmn.h
View File

@@ -590,7 +590,7 @@ extern WXDLLEXPORT_DATA(wxCursor*) wxCROSS_CURSOR;
extern WXDLLEXPORT_DATA(wxColourDatabase*) wxTheColourDatabase; extern WXDLLEXPORT_DATA(wxColourDatabase*) wxTheColourDatabase;
extern WXDLLEXPORT_DATA(const wxChar*) wxPanelNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[];
extern WXDLLEXPORT_DATA(const wxSize) wxDefaultSize; extern WXDLLEXPORT_DATA(const wxSize) wxDefaultSize;
extern WXDLLEXPORT_DATA(const wxPoint) wxDefaultPosition; extern WXDLLEXPORT_DATA(const wxPoint) wxDefaultPosition;

4
include/wx/generic/dirdlgg.h
View File

@@ -20,8 +20,8 @@ class WXDLLEXPORT wxTextCtrl;
class WXDLLEXPORT wxTreeEvent; class WXDLLEXPORT wxTreeEvent;
// we may be included directly as well as from wx/dirdlg.h (FIXME) // we may be included directly as well as from wx/dirdlg.h (FIXME)
extern WXDLLEXPORT_DATA(const wxChar*) wxDirDialogNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogNameStr[];
extern WXDLLEXPORT_DATA(const wxChar*) wxDirSelectorPromptStr; extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[];
#ifndef wxDD_DEFAULT_STYLE #ifndef wxDD_DEFAULT_STYLE
#ifdef __WXWINCE__ #ifdef __WXWINCE__

4
include/wx/generic/mdig.h
View File

@@ -20,8 +20,8 @@
#include "wx/panel.h" #include "wx/panel.h"
#include "wx/notebook.h" #include "wx/notebook.h"
extern WXDLLEXPORT_DATA(const wxChar*) wxFrameNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[];
extern WXDLLEXPORT_DATA(const wxChar*) wxStatusLineNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

2
include/wx/generic/msgdlgg.h
View File

@@ -18,7 +18,7 @@
// type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO // type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO
// Returns wxYES/NO/OK/CANCEL // Returns wxYES/NO/OK/CANCEL
extern WXDLLEXPORT_DATA(const wxChar*) wxMessageBoxCaptionStr; extern WXDLLEXPORT_DATA(const wxChar) wxMessageBoxCaptionStr[];
class WXDLLEXPORT wxGenericMessageDialog: public wxDialog, public wxMessageDialogBase class WXDLLEXPORT wxGenericMessageDialog: public wxDialog, public wxMessageDialogBase
{ {

2
include/wx/generic/panelg.h
View File

@@ -21,7 +21,7 @@
class WXDLLEXPORT wxControlContainer; class WXDLLEXPORT wxControlContainer;
extern WXDLLEXPORT_DATA(const wxChar*) wxPanelNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[];
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxPanel contains other controls and implements TAB traversal between them // wxPanel contains other controls and implements TAB traversal between them

2
include/wx/generic/statusbr.h
View File

@@ -17,7 +17,7 @@
#include "wx/statusbr.h" #include "wx/statusbr.h"
#include "wx/arrstr.h" #include "wx/arrstr.h"
extern WXDLLEXPORT_DATA(const wxChar*) wxPanelNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[];
class WXDLLEXPORT wxStatusBarGeneric : public wxStatusBarBase class WXDLLEXPORT wxStatusBarGeneric : public wxStatusBarBase
{ {

4
include/wx/generic/textdlgg.h
View File

@@ -24,8 +24,8 @@
class WXDLLEXPORT wxTextCtrl; class WXDLLEXPORT wxTextCtrl;
extern WXDLLEXPORT_DATA(const wxChar*) wxGetTextFromUserPromptStr; extern WXDLLEXPORT_DATA(const wxChar) wxGetTextFromUserPromptStr[];
extern WXDLLEXPORT_DATA(const wxChar*) wxGetPasswordFromUserPromptStr; extern WXDLLEXPORT_DATA(const wxChar) wxGetPasswordFromUserPromptStr[];
#define wxTextEntryDialogStyle (wxOK | wxCANCEL | wxCENTRE | wxWS_EX_VALIDATE_RECURSIVELY) #define wxTextEntryDialogStyle (wxOK | wxCANCEL | wxCENTRE | wxWS_EX_VALIDATE_RECURSIVELY)

2
include/wx/gtk/button.h
View File

@@ -25,7 +25,7 @@ class WXDLLIMPEXP_CORE wxButton;
// global data // global data
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
extern WXDLLIMPEXP_CORE const wxChar *wxButtonNameStr; extern WXDLLIMPEXP_CORE const wxChar wxButtonNameStr[];
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxButton // wxButton

2
include/wx/gtk/combobox.h
View File

@@ -27,7 +27,7 @@ class WXDLLIMPEXP_CORE wxComboBox;
// global data // global data
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
extern WXDLLIMPEXP_CORE const wxChar* wxComboBoxNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[];
extern WXDLLIMPEXP_BASE const wxChar* wxEmptyString; extern WXDLLIMPEXP_BASE const wxChar* wxEmptyString;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

2
include/wx/gtk/dialog.h
View File

@@ -23,7 +23,7 @@ class WXDLLIMPEXP_CORE wxDialog;
// global data // global data
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
extern WXDLLIMPEXP_CORE const wxChar *wxDialogNameStr; extern WXDLLIMPEXP_CORE const wxChar wxDialogNameStr[];
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxDialog // wxDialog

2
include/wx/gtk/gauge.h
View File

@@ -28,7 +28,7 @@ class WXDLLIMPEXP_CORE wxGauge;
// global data // global data
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
extern WXDLLIMPEXP_CORE const wxChar* wxGaugeNameStr; extern WXDLLIMPEXP_CORE const wxChar wxGaugeNameStr[];
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxGaugeBox // wxGaugeBox

4
include/wx/gtk/mdi.h
View File

@@ -30,8 +30,8 @@ class WXDLLIMPEXP_CORE wxMDIChildFrame;
// global data // global data
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
extern WXDLLIMPEXP_CORE const wxChar* wxFrameNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[];
extern WXDLLIMPEXP_CORE const wxChar* wxStatusLineNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxMDIParentFrame // wxMDIParentFrame

2
include/wx/gtk/msgdlg.h
View File

@@ -18,7 +18,7 @@
// type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO // type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO
// Returns wxYES/NO/OK/CANCEL // Returns wxYES/NO/OK/CANCEL
WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr; WXDLLEXPORT_DATA(extern const wxChar) wxMessageBoxCaptionStr[];
class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase
{ {

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

@@ -26,7 +26,7 @@ class WXDLLIMPEXP_CORE wxToggleBitmapButton;
// global data // global data
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
extern WXDLLIMPEXP_CORE const wxChar *wxCheckBoxNameStr; extern WXDLLIMPEXP_CORE const wxChar wxCheckBoxNameStr[];
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxToggleBitmapButton // wxToggleBitmapButton

2
include/wx/gtk1/button.h
View File

@@ -25,7 +25,7 @@ class WXDLLIMPEXP_CORE wxButton;
// global data // global data
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
extern WXDLLIMPEXP_CORE const wxChar *wxButtonNameStr; extern WXDLLIMPEXP_CORE const wxChar wxButtonNameStr[];
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxButton // wxButton

2
include/wx/gtk1/combobox.h
View File

@@ -27,7 +27,7 @@ class WXDLLIMPEXP_CORE wxComboBox;
// global data // global data
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
extern WXDLLIMPEXP_CORE const wxChar* wxComboBoxNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[];
extern WXDLLIMPEXP_BASE const wxChar* wxEmptyString; extern WXDLLIMPEXP_BASE const wxChar* wxEmptyString;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

2
include/wx/gtk1/dialog.h
View File

@@ -23,7 +23,7 @@ class WXDLLIMPEXP_CORE wxDialog;
// global data // global data
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
extern WXDLLIMPEXP_CORE const wxChar *wxDialogNameStr; extern WXDLLIMPEXP_CORE const wxChar wxDialogNameStr[];
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxDialog // wxDialog

2
include/wx/gtk1/gauge.h
View File

@@ -28,7 +28,7 @@ class WXDLLIMPEXP_CORE wxGauge;
// global data // global data
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
extern WXDLLIMPEXP_CORE const wxChar* wxGaugeNameStr; extern WXDLLIMPEXP_CORE const wxChar wxGaugeNameStr[];
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxGaugeBox // wxGaugeBox

4
include/wx/gtk1/mdi.h
View File

@@ -30,8 +30,8 @@ class WXDLLIMPEXP_CORE wxMDIChildFrame;
// global data // global data
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
extern WXDLLIMPEXP_CORE const wxChar* wxFrameNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[];
extern WXDLLIMPEXP_CORE const wxChar* wxStatusLineNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxMDIParentFrame // wxMDIParentFrame

2
include/wx/gtk1/msgdlg.h
View File

@@ -18,7 +18,7 @@
// type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO // type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO
// Returns wxYES/NO/OK/CANCEL // Returns wxYES/NO/OK/CANCEL
WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr; WXDLLEXPORT_DATA(extern const wxChar) wxMessageBoxCaptionStr[];
class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase
{ {

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

@@ -26,7 +26,7 @@ class WXDLLIMPEXP_CORE wxToggleBitmapButton;
// global data // global data
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
extern WXDLLIMPEXP_CORE const wxChar *wxCheckBoxNameStr; extern WXDLLIMPEXP_CORE const wxChar wxCheckBoxNameStr[];
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxToggleBitmapButton // wxToggleBitmapButton

2
include/wx/listbox.h
View File

@@ -30,7 +30,7 @@ class WXDLLIMPEXP_BASE wxArrayString;
// global data // global data
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
extern WXDLLEXPORT_DATA(const wxChar*) wxListBoxNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxListBoxNameStr[];
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxListBox interface is defined by the class wxListBoxBase // wxListBox interface is defined by the class wxListBoxBase

2
include/wx/listctrl.h
View File

@@ -22,7 +22,7 @@
// constants // constants
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
extern WXDLLEXPORT_DATA(const wxChar*) wxListCtrlNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxListCtrlNameStr[];
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// include the wxListCtrl class declaration // include the wxListCtrl class declaration

2
include/wx/mac/carbon/bmpbuttn.h
View File

@@ -14,7 +14,7 @@
#include "wx/button.h" #include "wx/button.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxButtonNameStr[];
#define wxDEFAULT_BUTTON_MARGIN 4 #define wxDEFAULT_BUTTON_MARGIN 4

2
include/wx/mac/carbon/button.h
View File

@@ -15,7 +15,7 @@
#include "wx/control.h" #include "wx/control.h"
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxButtonNameStr[];
// Pushbutton // Pushbutton
class WXDLLEXPORT wxButton: public wxButtonBase class WXDLLEXPORT wxButton: public wxButtonBase

2
include/wx/mac/carbon/choice.h
View File

@@ -17,7 +17,7 @@
#include "wx/dynarray.h" #include "wx/dynarray.h"
#include "wx/arrstr.h" #include "wx/arrstr.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxChoiceNameStr[];
WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ; WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ;

2
include/wx/mac/carbon/combobox.h
View File

@@ -14,7 +14,7 @@
#include "wx/choice.h" #include "wx/choice.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxComboBoxNameStr[];
// forward declaration of private implementation classes // forward declaration of private implementation classes

2
include/wx/mac/carbon/control.h
View File

@@ -12,7 +12,7 @@
#ifndef _WX_CONTROL_H_ #ifndef _WX_CONTROL_H_
#define _WX_CONTROL_H_ #define _WX_CONTROL_H_
WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxControlNameStr[];
// General item class // General item class
class WXDLLEXPORT wxControl : public wxControlBase class WXDLLEXPORT wxControl : public wxControlBase

2
include/wx/mac/carbon/dialog.h
View File

@@ -14,7 +14,7 @@
#include "wx/panel.h" #include "wx/panel.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxDialogNameStr[];
class WXDLLEXPORT wxMacToolTip ; class WXDLLEXPORT wxMacToolTip ;

4
include/wx/mac/carbon/frame.h
View File

@@ -17,8 +17,8 @@
#include "wx/accel.h" #include "wx/accel.h"
#include "wx/icon.h" #include "wx/icon.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxFrameNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxToolBarNameStr[];
class WXDLLEXPORT wxMenuBar; class WXDLLEXPORT wxMenuBar;
class WXDLLEXPORT wxStatusBar; class WXDLLEXPORT wxStatusBar;

2
include/wx/mac/carbon/gauge.h
View File

@@ -14,7 +14,7 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxGaugeNameStr[];
// Group box // Group box
class WXDLLEXPORT wxGauge: public wxGaugeBase class WXDLLEXPORT wxGauge: public wxGaugeBase

4
include/wx/mac/carbon/mdi.h
View File

@@ -16,8 +16,8 @@
#include "wx/frame.h" #include "wx/frame.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxFrameNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxStatusLineNameStr[];
class WXDLLEXPORT wxMDIClientWindow; class WXDLLEXPORT wxMDIClientWindow;
class WXDLLEXPORT wxMDIChildFrame; class WXDLLEXPORT wxMDIChildFrame;

2
include/wx/mac/carbon/msgdlg.h
View File

@@ -20,7 +20,7 @@
* Message box dialog * Message box dialog
*/ */
WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr; WXDLLEXPORT_DATA(extern const wxChar) wxMessageBoxCaptionStr[];
class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase
{ {

2
include/wx/mac/carbon/radiobut.h
View File

@@ -56,7 +56,7 @@ public:
#if 0 #if 0
class WXDLLEXPORT wxBitmap ; class WXDLLEXPORT wxBitmap ;
WXDLLEXPORT_DATA(extern const char*) wxBitmapRadioButtonNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxBitmapRadioButtonNameStr[];
class WXDLLEXPORT wxBitmapRadioButton: public wxRadioButton class WXDLLEXPORT wxBitmapRadioButton: public wxRadioButton
{ {

2
include/wx/mac/carbon/scrolbar.h
View File

@@ -14,7 +14,7 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxScrollBarNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxScrollBarNameStr[];
// Scrollbar item // Scrollbar item
class WXDLLEXPORT wxScrollBar: public wxControl class WXDLLEXPORT wxScrollBar: public wxControl

2
include/wx/mac/carbon/slider.h
View File

@@ -16,7 +16,7 @@
#include "wx/slider.h" #include "wx/slider.h"
#include "wx/stattext.h" #include "wx/stattext.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxSliderNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxSliderNameStr[];
// Slider // Slider
class WXDLLEXPORT wxSlider: public wxSliderBase class WXDLLEXPORT wxSlider: public wxSliderBase

2
include/wx/mac/carbon/statbox.h
View File

@@ -14,7 +14,7 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBoxNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxStaticBoxNameStr[];
// Group box // Group box
class WXDLLEXPORT wxStaticBox: public wxControl class WXDLLEXPORT wxStaticBox: public wxControl

2
include/wx/mac/carbon/textctrl.h
View File

@@ -22,7 +22,7 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxTextCtrlNameStr[];
class wxMacTextControl ; class wxMacTextControl ;

2
include/wx/mac/carbon/tglbtn.h
View File

@@ -13,7 +13,7 @@
#ifndef _WX_TOGGLEBUTTON_H_ #ifndef _WX_TOGGLEBUTTON_H_
#define _WX_TOGGLEBUTTON_H_ #define _WX_TOGGLEBUTTON_H_
WXDLLEXPORT_DATA(extern const wxChar*) wxCheckBoxNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxCheckBoxNameStr[];
// Checkbox item (single checkbox) // Checkbox item (single checkbox)
class WXDLLEXPORT wxToggleButton : public wxControl class WXDLLEXPORT wxToggleButton : public wxControl

2
include/wx/mac/carbon/toolbar.h
View File

@@ -17,7 +17,7 @@
#include "wx/tbarbase.h" #include "wx/tbarbase.h"
#include "wx/dynarray.h" #include "wx/dynarray.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxToolBarNameStr[];
class WXDLLEXPORT wxToolBar: public wxToolBarBase class WXDLLEXPORT wxToolBar: public wxToolBarBase
{ {

2
include/wx/mac/classic/bmpbuttn.h
View File

@@ -14,7 +14,7 @@
#include "wx/button.h" #include "wx/button.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxButtonNameStr[];
#define wxDEFAULT_BUTTON_MARGIN 4 #define wxDEFAULT_BUTTON_MARGIN 4

2
include/wx/mac/classic/button.h
View File

@@ -15,7 +15,7 @@
#include "wx/control.h" #include "wx/control.h"
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxButtonNameStr[];
// Pushbutton // Pushbutton
class WXDLLEXPORT wxButton: public wxButtonBase class WXDLLEXPORT wxButton: public wxButtonBase

2
include/wx/mac/classic/choice.h
View File

@@ -17,7 +17,7 @@
#include "wx/dynarray.h" #include "wx/dynarray.h"
#include "wx/arrstr.h" #include "wx/arrstr.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxChoiceNameStr[];
WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ; WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ;

2
include/wx/mac/classic/combobox.h
View File

@@ -14,7 +14,7 @@
#include "wx/choice.h" #include "wx/choice.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxComboBoxNameStr[];
// Combobox item // Combobox item
class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase

2
include/wx/mac/classic/control.h
View File

@@ -12,7 +12,7 @@
#ifndef _WX_CONTROL_H_ #ifndef _WX_CONTROL_H_
#define _WX_CONTROL_H_ #define _WX_CONTROL_H_
WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxControlNameStr[];
// General item class // General item class
class WXDLLEXPORT wxControl : public wxControlBase class WXDLLEXPORT wxControl : public wxControlBase

4
include/wx/mac/classic/dialog.h
View File

@@ -14,9 +14,9 @@
#include "wx/panel.h" #include "wx/panel.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxDialogNameStr[];
class WXDLLEXPORT wxMacToolTip ; class WXDLLEXPORT wxMacToolTip;
// Dialog boxes // Dialog boxes
class WXDLLEXPORT wxDialog : public wxDialogBase class WXDLLEXPORT wxDialog : public wxDialogBase

4
include/wx/mac/classic/frame.h
View File

@@ -17,8 +17,8 @@
#include "wx/accel.h" #include "wx/accel.h"
#include "wx/icon.h" #include "wx/icon.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxFrameNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxToolBarNameStr[];
class WXDLLEXPORT wxMenuBar; class WXDLLEXPORT wxMenuBar;
class WXDLLEXPORT wxStatusBar; class WXDLLEXPORT wxStatusBar;

2
include/wx/mac/classic/gauge.h
View File

@@ -14,7 +14,7 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxGaugeNameStr[];
// Group box // Group box
class WXDLLEXPORT wxGauge: public wxGaugeBase class WXDLLEXPORT wxGauge: public wxGaugeBase

4
include/wx/mac/classic/mdi.h
View File

@@ -16,8 +16,8 @@
#include "wx/frame.h" #include "wx/frame.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxFrameNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxStatusLineNameStr[];
class WXDLLEXPORT wxMDIClientWindow; class WXDLLEXPORT wxMDIClientWindow;
class WXDLLEXPORT wxMDIChildFrame; class WXDLLEXPORT wxMDIChildFrame;

2
include/wx/mac/classic/msgdlg.h
View File

@@ -20,7 +20,7 @@
* Message box dialog * Message box dialog
*/ */
WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr; WXDLLEXPORT_DATA(extern const wxChar) wxMessageBoxCaptionStr[];
class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase
{ {

2
include/wx/mac/classic/radiobut.h
View File

@@ -54,7 +54,7 @@ public:
#if 0 #if 0
class WXDLLEXPORT wxBitmap ; class WXDLLEXPORT wxBitmap ;
WXDLLEXPORT_DATA(extern const char*) wxBitmapRadioButtonNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxBitmapRadioButtonNameStr[];
class WXDLLEXPORT wxBitmapRadioButton: public wxRadioButton class WXDLLEXPORT wxBitmapRadioButton: public wxRadioButton
{ {

2
include/wx/mac/classic/scrolbar.h
View File

@@ -14,7 +14,7 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxScrollBarNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxScrollBarNameStr[];
// Scrollbar item // Scrollbar item
class WXDLLEXPORT wxScrollBar: public wxControl class WXDLLEXPORT wxScrollBar: public wxControl

2
include/wx/mac/classic/slider.h
View File

@@ -16,7 +16,7 @@
#include "wx/slider.h" #include "wx/slider.h"
#include "wx/stattext.h" #include "wx/stattext.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxSliderNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxSliderNameStr[];
// Slider // Slider
class WXDLLEXPORT wxSlider: public wxControl class WXDLLEXPORT wxSlider: public wxControl

2
include/wx/mac/classic/statbox.h
View File

@@ -14,7 +14,7 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBoxNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxStaticBoxNameStr[];
// Group box // Group box
class WXDLLEXPORT wxStaticBox: public wxControl class WXDLLEXPORT wxStaticBox: public wxControl

2
include/wx/mac/classic/textctrl.h
View File

@@ -14,7 +14,7 @@
#include "wx/control.h" #include "wx/control.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxTextCtrlNameStr[];
// Single-line text item // Single-line text item
class WXDLLEXPORT wxTextCtrl: public wxTextCtrlBase class WXDLLEXPORT wxTextCtrl: public wxTextCtrlBase

2
include/wx/mac/classic/tglbtn.h
View File

@@ -13,7 +13,7 @@
#ifndef _WX_TOGGLEBUTTON_H_ #ifndef _WX_TOGGLEBUTTON_H_
#define _WX_TOGGLEBUTTON_H_ #define _WX_TOGGLEBUTTON_H_
WXDLLEXPORT_DATA(extern const wxChar*) wxCheckBoxNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxCheckBoxNameStr[];
// Checkbox item (single checkbox) // Checkbox item (single checkbox)
class WXDLLEXPORT wxToggleButton : public wxControl class WXDLLEXPORT wxToggleButton : public wxControl

2
include/wx/mac/classic/toolbar.h
View File

@@ -17,7 +17,7 @@
#include "wx/tbarbase.h" #include "wx/tbarbase.h"
#include "wx/dynarray.h" #include "wx/dynarray.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxToolBarNameStr[];
class WXDLLEXPORT wxToolBar: public wxToolBarBase class WXDLLEXPORT wxToolBar: public wxToolBarBase
{ {

2
include/wx/motif/msgdlg.h
View File

@@ -20,7 +20,7 @@
// Message box dialog // Message box dialog
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
WXDLLEXPORT_DATA(extern const char*) wxMessageBoxCaptionStr; WXDLLEXPORT_DATA(extern const wxChar) wxMessageBoxCaptionStr[];
class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase
{ {

4
include/wx/msw/dialog.h
View File

@@ -14,13 +14,13 @@
#include "wx/panel.h" #include "wx/panel.h"
extern WXDLLEXPORT_DATA(const wxChar*) wxDialogNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[];
class WXDLLEXPORT wxDialogModalData; class WXDLLEXPORT wxDialogModalData;
#if wxUSE_TOOLBAR && (defined(__SMARTPHONE__) || defined(__POCKETPC__)) #if wxUSE_TOOLBAR && (defined(__SMARTPHONE__) || defined(__POCKETPC__))
class WXDLLEXPORT wxToolBar; class WXDLLEXPORT wxToolBar;
extern WXDLLEXPORT_DATA(const wxChar*) wxToolBarNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[];
#endif #endif
// Dialog boxes // Dialog boxes

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

@@ -14,7 +14,7 @@
#if wxUSE_GAUGE #if wxUSE_GAUGE
extern WXDLLEXPORT_DATA(const wxChar*) wxGaugeNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxGaugeNameStr[];
// Group box // Group box
class WXDLLEXPORT wxGauge95 : public wxGaugeBase class WXDLLEXPORT wxGauge95 : public wxGaugeBase

4
include/wx/msw/mdi.h
View File

@@ -14,8 +14,8 @@
#include "wx/frame.h" #include "wx/frame.h"
extern WXDLLEXPORT_DATA(const wxChar*) wxFrameNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[];
extern WXDLLEXPORT_DATA(const wxChar*) wxStatusLineNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
class WXDLLEXPORT wxMDIClientWindow; class WXDLLEXPORT wxMDIClientWindow;
class WXDLLEXPORT wxMDIChildFrame; class WXDLLEXPORT wxMDIChildFrame;

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

@@ -19,7 +19,7 @@
* Message box dialog * Message box dialog
*/ */
extern WXDLLEXPORT_DATA(const wxChar*) wxMessageBoxCaptionStr; extern WXDLLEXPORT_DATA(const wxChar) wxMessageBoxCaptionStr[];
class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase
{ {

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

@@ -16,7 +16,7 @@
#include "wx/icon.h" #include "wx/icon.h"
#include "wx/bitmap.h" #include "wx/bitmap.h"
extern WXDLLEXPORT_DATA(const wxChar*) wxStaticBitmapNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxStaticBitmapNameStr[];
// a control showing an icon or a bitmap // a control showing an icon or a bitmap
class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase

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

@@ -14,7 +14,7 @@
class WXDLLIMPEXP_CORE wxImageList; class WXDLLIMPEXP_CORE wxImageList;
// extern WXDLLEXPORT_DATA(const wxChar*) wxToolBarNameStr; // extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[];
/* /*
* Flags returned by HitTest * Flags returned by HitTest

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

@@ -16,7 +16,7 @@
#include "wx/tbarbase.h" #include "wx/tbarbase.h"
extern WXDLLEXPORT_DATA(const wxChar*) wxButtonBarNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxButtonBarNameStr[];
class WXDLLEXPORT wxMemoryDC; class WXDLLEXPORT wxMemoryDC;

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

@@ -13,7 +13,7 @@
#ifndef _WX_TOGGLEBUTTON_H_ #ifndef _WX_TOGGLEBUTTON_H_
#define _WX_TOGGLEBUTTON_H_ #define _WX_TOGGLEBUTTON_H_
extern WXDLLEXPORT_DATA(const wxChar*) wxCheckBoxNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxCheckBoxNameStr[];
// Checkbox item (single checkbox) // Checkbox item (single checkbox)
class WXDLLEXPORT wxToggleButton : public wxControl class WXDLLEXPORT wxToggleButton : public wxControl

2
include/wx/notebook.h
View File

@@ -37,7 +37,7 @@ enum
typedef wxWindow wxNotebookPage; // so far, any window can be a page typedef wxWindow wxNotebookPage; // so far, any window can be a page
extern WXDLLEXPORT_DATA(const wxChar*) wxNotebookNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxNotebookNameStr[];
#if WXWIN_COMPATIBILITY_2_4 #if WXWIN_COMPATIBILITY_2_4
#define wxNOTEBOOK_NAME wxNotebookNameStr #define wxNOTEBOOK_NAME wxNotebookNameStr

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

@@ -15,7 +15,7 @@
#include "wx/button.h" #include "wx/button.h"
#include "wx/dcclient.h" #include "wx/dcclient.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxButtonNameStr[];
#define wxDEFAULT_BUTTON_MARGIN 4 #define wxDEFAULT_BUTTON_MARGIN 4

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

@@ -14,7 +14,7 @@
#include "wx/panel.h" #include "wx/panel.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxDialogNameStr[];
class WXDLLEXPORT wxDialogModalData; class WXDLLEXPORT wxDialogModalData;

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

@@ -14,7 +14,7 @@
#include "wx/dialog.h" #include "wx/dialog.h"
WXDLLEXPORT_DATA(extern const char*) wxFileSelectorPromptStr; WXDLLEXPORT_DATA(extern const wxChar) wxFileSelectorPromptStr[];
class WXDLLEXPORT wxDirDialog: public wxDialog class WXDLLEXPORT wxDirDialog: public wxDialog
{ {

68
include/wx/os2/private.h
View File

@@ -93,42 +93,42 @@ class WXDLLEXPORT wxBitmap;
// //
// Controls // Controls
// //
WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxButtonNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxCanvasNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxCanvasNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxCheckBoxNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxCheckBoxNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxChoiceNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxComboBoxNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxDialogNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxFrameNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxGaugeNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBoxNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxStaticBoxNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxListBoxNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxListBoxNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxStaticTextNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxStaticTextNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxStaticBitmapNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxMultiTextNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxMultiTextNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxPanelNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxRadioBoxNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxRadioBoxNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxRadioButtonNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxRadioButtonNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxBitmapRadioButtonNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxBitmapRadioButtonNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxScrollBarNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxScrollBarNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxSliderNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxSliderNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxStaticNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxStaticNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlWindowNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxTextCtrlWindowNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxTextCtrlNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxVirtListBoxNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxVirtListBoxNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxButtonBarNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxButtonBarNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxEnhDialogNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxEnhDialogNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxToolBarNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxStatusLineNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxGetTextFromUserPromptStr; WXDLLEXPORT_DATA(extern const wxChar) wxGetTextFromUserPromptStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr; WXDLLEXPORT_DATA(extern const wxChar) wxMessageBoxCaptionStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorPromptStr; WXDLLEXPORT_DATA(extern const wxChar) wxFileSelectorPromptStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorDefaultWildcardStr; WXDLLEXPORT_DATA(extern const wxChar) wxFileSelectorDefaultWildcardStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxInternalErrorStr; WXDLLEXPORT_DATA(extern const wxChar*) wxInternalErrorStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxFatalErrorStr; WXDLLEXPORT_DATA(extern const wxChar*) wxFatalErrorStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxTreeCtrlNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxTreeCtrlNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxDirDialogNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogDefaultFolderStr; WXDLLEXPORT_DATA(extern const wxChar) wxDirDialogDefaultFolderStr[];
// //
// Class names // Class names

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

@@ -13,7 +13,7 @@
#ifndef _WX_TOGGLEBUTTON_H_ #ifndef _WX_TOGGLEBUTTON_H_
#define _WX_TOGGLEBUTTON_H_ #define _WX_TOGGLEBUTTON_H_
extern WXDLLEXPORT_DATA(const wxChar*) wxCheckBoxNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxCheckBoxNameStr[];
// Checkbox item (single checkbox) // Checkbox item (single checkbox)
class WXDLLEXPORT wxToggleButton : public wxControl class WXDLLEXPORT wxToggleButton : public wxControl

2
include/wx/palmos/dialog.h
View File

@@ -14,7 +14,7 @@
#include "wx/panel.h" #include "wx/panel.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxDialogNameStr[];
class WXDLLEXPORT wxDialogModalData; class WXDLLEXPORT wxDialogModalData;

2
include/wx/palmos/gauge.h
View File

@@ -14,7 +14,7 @@
#if wxUSE_GAUGE #if wxUSE_GAUGE
WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxGaugeNameStr[];
// Group box // Group box
class WXDLLEXPORT wxGauge : public wxGaugeBase class WXDLLEXPORT wxGauge : public wxGaugeBase

4
include/wx/palmos/mdi.h
View File

@@ -14,8 +14,8 @@
#include "wx/frame.h" #include "wx/frame.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxFrameNameStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxStatusLineNameStr[];
class WXDLLEXPORT wxMDIClientWindow; class WXDLLEXPORT wxMDIClientWindow;
class WXDLLEXPORT wxMDIChildFrame; class WXDLLEXPORT wxMDIChildFrame;

2
include/wx/palmos/msgdlg.h
View File

@@ -19,7 +19,7 @@
* Message box dialog * Message box dialog
*/ */
WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr; WXDLLEXPORT_DATA(extern const wxChar) wxMessageBoxCaptionStr[];
class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase
{ {

2
include/wx/palmos/statbmp.h
View File

@@ -16,7 +16,7 @@
#include "wx/icon.h" #include "wx/icon.h"
#include "wx/bitmap.h" #include "wx/bitmap.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxStaticBitmapNameStr[];
// a control showing an icon or a bitmap // a control showing an icon or a bitmap
class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase

2
include/wx/palmos/tabctrl.h
View File

@@ -14,7 +14,7 @@
class wxImageList; class wxImageList;
// WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr; // WXDLLEXPORT_DATA(extern const wxChar) wxToolBarNameStr[];
/* /*
* Flags returned by HitTest * Flags returned by HitTest

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

@@ -13,7 +13,7 @@
#ifndef _WX_TOGGLEBUTTON_H_ #ifndef _WX_TOGGLEBUTTON_H_
#define _WX_TOGGLEBUTTON_H_ #define _WX_TOGGLEBUTTON_H_
WXDLLEXPORT_DATA(extern const wxChar*) wxCheckBoxNameStr; WXDLLEXPORT_DATA(extern const wxChar) wxCheckBoxNameStr[];
// Checkbox item (single checkbox) // Checkbox item (single checkbox)
class WXDLLEXPORT wxToggleButton : public wxControl class WXDLLEXPORT wxToggleButton : public wxControl

2
include/wx/radiobox.h
View File

@@ -16,7 +16,7 @@
#include "wx/ctrlsub.h" #include "wx/ctrlsub.h"
extern WXDLLEXPORT_DATA(const wxChar*) wxRadioBoxNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxRadioBoxNameStr[];
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxRadioBoxBase is not a normal base class, but rather a mix-in because the // wxRadioBoxBase is not a normal base class, but rather a mix-in because the

2
include/wx/radiobut.h
View File

@@ -33,7 +33,7 @@
#include "wx/control.h" #include "wx/control.h"
extern WXDLLEXPORT_DATA(const wxChar*) wxRadioButtonNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxRadioButtonNameStr[];
#if defined(__WXUNIVERSAL__) #if defined(__WXUNIVERSAL__)
#include "wx/univ/radiobut.h" #include "wx/univ/radiobut.h"

2
include/wx/scrolbar.h
View File

@@ -18,7 +18,7 @@
#include "wx/control.h" #include "wx/control.h"
extern WXDLLEXPORT_DATA(const wxChar*) wxScrollBarNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxScrollBarNameStr[];
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxScrollBar: a scroll bar control // wxScrollBar: a scroll bar control

2
include/wx/slider.h
View File

@@ -44,7 +44,7 @@
#define wxSL_NOTIFY_DRAG 0x0000 #define wxSL_NOTIFY_DRAG 0x0000
extern WXDLLEXPORT_DATA(const wxChar*) wxSliderNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxSliderNameStr[];
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxSliderBase: define wxSlider interface // wxSliderBase: define wxSlider interface

2
include/wx/statbmp.h
View File

@@ -20,7 +20,7 @@
#include "wx/bitmap.h" #include "wx/bitmap.h"
#include "wx/icon.h" #include "wx/icon.h"
extern WXDLLEXPORT_DATA(const wxChar*) wxStaticBitmapNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxStaticBitmapNameStr[];
// a control showing an icon or a bitmap // a control showing an icon or a bitmap
class WXDLLEXPORT wxStaticBitmapBase : public wxControl class WXDLLEXPORT wxStaticBitmapBase : public wxControl

2
include/wx/statbox.h
View File

@@ -18,7 +18,7 @@
#include "wx/control.h" #include "wx/control.h"
extern WXDLLEXPORT_DATA(const wxChar*) wxStaticBoxNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxStaticBoxNameStr[];
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxStaticBox: a grouping box with a label // wxStaticBox: a grouping box with a label

2
include/wx/statline.h
View File

@@ -28,7 +28,7 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// the default name for objects of class wxStaticLine // the default name for objects of class wxStaticLine
extern WXDLLEXPORT_DATA(const wxChar*) wxStaticTextNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxStaticTextNameStr[];
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxStaticLine - a line in a dialog // wxStaticLine - a line in a dialog

2
include/wx/stattext.h
View File

@@ -18,7 +18,7 @@
#include "wx/control.h" #include "wx/control.h"
extern WXDLLEXPORT_DATA(const wxChar*) wxStaticTextNameStr; extern WXDLLEXPORT_DATA(const wxChar) wxStaticTextNameStr[];
class WXDLLEXPORT wxStaticTextBase : public wxControl class WXDLLEXPORT wxStaticTextBase : public wxControl
{ {

Some files were not shown because too many files have changed in this diff Show More