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

substitute WXDLLEXPORT with WXDLLIMPEXP_CORE and WXDLLEXPORT_DATA with WXDLLIMPEXP_DATA_CORE

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-03-26 15:06:00 +00:00
parent 59022c25c1
commit 53a2db124c
638 changed files with 1407 additions and 1409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,7 @@ class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
// wxAcceleratorTable
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxAcceleratorTable : public wxObject
class WXDLLIMPEXP_CORE wxAcceleratorTable : public wxObject
{
public:
wxAcceleratorTable();

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

@@ -23,7 +23,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindow;
// Can be used in exactly same way as wxBusyCursor
//--------------------------------------------------------------------------------
class WXDLLEXPORT wxBusyInfo : public wxObject
class WXDLLIMPEXP_CORE wxBusyInfo : public wxObject
{
public:
wxBusyInfo(const wxString& message, wxWindow *parent = NULL);

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

@@ -22,7 +22,7 @@ class WXDLLIMPEXP_FWD_CORE wxButtonToolBarTool;
// wxButtonToolBar
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxButtonToolBar : public wxToolBarBase
class WXDLLIMPEXP_CORE wxButtonToolBar : public wxToolBarBase
{
public:
// construction/destruction

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

@@ -22,7 +22,7 @@
class WXDLLIMPEXP_FWD_CORE wxCaret;
class WXDLLEXPORT wxCaretTimer : public wxTimer
class WXDLLIMPEXP_CORE wxCaretTimer : public wxTimer
{
public:
wxCaretTimer(wxCaret *caret);

22
include/wx/generic/choicdgg.h
View File

@@ -36,7 +36,7 @@ class WXDLLIMPEXP_FWD_CORE wxListBoxBase;
// wxAnyChoiceDialog: a base class for dialogs containing a listbox
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxAnyChoiceDialog : public wxDialog
class WXDLLIMPEXP_CORE wxAnyChoiceDialog : public wxDialog
{
public:
wxAnyChoiceDialog() { }
@@ -93,7 +93,7 @@ protected:
// wxSingleChoiceDialog: a dialog with single selection listbox
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxSingleChoiceDialog : public wxAnyChoiceDialog
class WXDLLIMPEXP_CORE wxSingleChoiceDialog : public wxAnyChoiceDialog
{
public:
wxSingleChoiceDialog()
@@ -164,7 +164,7 @@ private:
// wxMultiChoiceDialog: a dialog with multi selection listbox
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxMultiChoiceDialog : public wxAnyChoiceDialog
class WXDLLIMPEXP_CORE wxMultiChoiceDialog : public wxAnyChoiceDialog
{
public:
wxMultiChoiceDialog() { }
@@ -227,7 +227,7 @@ private:
// ----------------------------------------------------------------------------
// get the user selection as a string
WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message,
WXDLLIMPEXP_CORE wxString wxGetSingleChoice(const wxString& message,
const wxString& caption,
const wxArrayString& choices,
wxWindow *parent = NULL,
@@ -237,7 +237,7 @@ WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message,
int width = wxCHOICE_WIDTH,
int height = wxCHOICE_HEIGHT);
WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message,
WXDLLIMPEXP_CORE wxString wxGetSingleChoice(const wxString& message,
const wxString& caption,
int n, const wxString *choices,
wxWindow *parent = NULL,
@@ -249,7 +249,7 @@ WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message,
// Same as above but gets position in list of strings, instead of string,
// or -1 if no selection
WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message,
WXDLLIMPEXP_CORE int wxGetSingleChoiceIndex(const wxString& message,
const wxString& caption,
const wxArrayString& choices,
wxWindow *parent = NULL,
@@ -259,7 +259,7 @@ WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message,
int width = wxCHOICE_WIDTH,
int height = wxCHOICE_HEIGHT);
WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message,
WXDLLIMPEXP_CORE int wxGetSingleChoiceIndex(const wxString& message,
const wxString& caption,
int n, const wxString *choices,
wxWindow *parent = NULL,
@@ -270,7 +270,7 @@ WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message,
int height = wxCHOICE_HEIGHT);
// Return client data instead or NULL if cancelled
WXDLLEXPORT void* wxGetSingleChoiceData(const wxString& message,
WXDLLIMPEXP_CORE void* wxGetSingleChoiceData(const wxString& message,
const wxString& caption,
const wxArrayString& choices,
void **client_data,
@@ -281,7 +281,7 @@ WXDLLEXPORT void* wxGetSingleChoiceData(const wxString& message,
int width = wxCHOICE_WIDTH,
int height = wxCHOICE_HEIGHT);
WXDLLEXPORT void* wxGetSingleChoiceData(const wxString& message,
WXDLLIMPEXP_CORE void* wxGetSingleChoiceData(const wxString& message,
const wxString& caption,
int n, const wxString *choices,
void **client_data,
@@ -295,7 +295,7 @@ WXDLLEXPORT void* wxGetSingleChoiceData(const wxString& message,
// fill the array with the indices of the chosen items, it will be empty
// if no items were selected or Cancel was pressed - return the number of
// selections
WXDLLEXPORT size_t wxGetMultipleChoices(wxArrayInt& selections,
WXDLLIMPEXP_CORE size_t wxGetMultipleChoices(wxArrayInt& selections,
const wxString& message,
const wxString& caption,
int n, const wxString *choices,
@@ -306,7 +306,7 @@ WXDLLEXPORT size_t wxGetMultipleChoices(wxArrayInt& selections,
int width = wxCHOICE_WIDTH,
int height = wxCHOICE_HEIGHT);
WXDLLEXPORT size_t wxGetMultipleChoices(wxArrayInt& selections,
WXDLLIMPEXP_CORE size_t wxGetMultipleChoices(wxArrayInt& selections,
const wxString& message,
const wxString& caption,
const wxArrayString& choices,

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

@@ -15,7 +15,7 @@
#include "wx/object.h"
// Colour
class WXDLLEXPORT wxColour: public wxColourBase
class WXDLLIMPEXP_CORE wxColour: public wxColourBase
{
public:
// constructors

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

@@ -29,7 +29,7 @@
#endif // wxUSE_SLIDER
class WXDLLEXPORT wxGenericColourDialog : public wxDialog
class WXDLLIMPEXP_CORE wxGenericColourDialog : public wxDialog
{
public:
wxGenericColourDialog();

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

@@ -33,7 +33,7 @@
extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[];
class WXDLLEXPORT wxGenericComboCtrl : public wxComboCtrlBase
class WXDLLIMPEXP_CORE wxGenericComboCtrl : public wxComboCtrlBase
{
public:
// ctors and such
@@ -101,7 +101,7 @@ private:
// If native wxComboCtrl was not defined, then prepare a simple
// front-end so that wxRTTI works as expected.
class WXDLLEXPORT wxComboCtrl : public wxGenericComboCtrl
class WXDLLIMPEXP_CORE wxComboCtrl : public wxGenericComboCtrl
{
public:
wxComboCtrl() : wxGenericComboCtrl() {}

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

@@ -27,7 +27,7 @@
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxPostScriptDC : public wxDC
class WXDLLIMPEXP_CORE wxPostScriptDC : public wxDC
{
public:
wxPostScriptDC();
@@ -39,7 +39,7 @@ private:
DECLARE_DYNAMIC_CLASS(wxPostScriptDC)
};
class WXDLLEXPORT wxPostScriptDCImpl : public wxDCImpl
class WXDLLIMPEXP_CORE wxPostScriptDCImpl : public wxDCImpl
{
public:
wxPostScriptDCImpl( wxPrinterDC *owner );

10
include/wx/generic/dirctrlg.h
View File

@@ -58,7 +58,7 @@ enum
// wxDirItemData
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxDirItemData : public wxTreeItemData
class WXDLLIMPEXP_CORE wxDirItemData : public wxTreeItemData
{
public:
wxDirItemData(const wxString& path, const wxString& name, bool isDir);
@@ -80,7 +80,7 @@ public:
class WXDLLIMPEXP_FWD_CORE wxDirFilterListCtrl;
class WXDLLEXPORT wxGenericDirCtrl: public wxControl
class WXDLLIMPEXP_CORE wxGenericDirCtrl: public wxControl
{
public:
wxGenericDirCtrl();
@@ -206,7 +206,7 @@ private:
// wxDirFilterListCtrl
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxDirFilterListCtrl: public wxChoice
class WXDLLIMPEXP_CORE wxDirFilterListCtrl: public wxChoice
{
public:
wxDirFilterListCtrl() { Init(); }
@@ -258,7 +258,7 @@ protected:
#if wxUSE_DIRDLG || wxUSE_FILEDLG
class WXDLLEXPORT wxFileIconsTable
class WXDLLIMPEXP_CORE wxFileIconsTable
{
public:
wxFileIconsTable();
@@ -288,7 +288,7 @@ protected:
};
// The global fileicons table
extern WXDLLEXPORT_DATA(wxFileIconsTable *) wxTheFileIconsTable;
extern WXDLLIMPEXP_DATA_CORE(wxFileIconsTable *) wxTheFileIconsTable;
#endif // wxUSE_DIRDLG || wxUSE_FILEDLG

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

@@ -20,8 +20,8 @@ class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxTreeEvent;
// we may be included directly as well as from wx/dirdlg.h (FIXME)
extern WXDLLEXPORT_DATA(const char) wxDirDialogNameStr[];
extern WXDLLEXPORT_DATA(const char) wxDirSelectorPromptStr[];
extern WXDLLIMPEXP_DATA_CORE(const char) wxDirDialogNameStr[];
extern WXDLLIMPEXP_DATA_CORE(const char) wxDirSelectorPromptStr[];
#ifndef wxDD_DEFAULT_STYLE
#ifdef __WXWINCE__
@@ -37,7 +37,7 @@ extern WXDLLEXPORT_DATA(const char) wxDirSelectorPromptStr[];
// wxGenericDirDialog
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxGenericDirDialog : public wxDirDialogBase
class WXDLLIMPEXP_CORE wxGenericDirDialog : public wxDirDialogBase
{
public:
wxGenericDirDialog() : wxDirDialogBase() { }

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

@@ -88,7 +88,7 @@
* wxGenericDragImage
*/
class WXDLLEXPORT wxGenericDragImage: public wxObject
class WXDLLIMPEXP_CORE wxGenericDragImage: public wxObject
{
public:

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

@@ -20,7 +20,7 @@ class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
// wxGenericFindReplaceDialog: dialog for searching / replacing text
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxGenericFindReplaceDialog : public wxFindReplaceDialogBase
class WXDLLIMPEXP_CORE wxGenericFindReplaceDialog : public wxFindReplaceDialogBase
{
public:
wxGenericFindReplaceDialog() { Init(); }

6
include/wx/generic/filectrlg.h
View File

@@ -24,13 +24,13 @@ class WXDLLIMPEXP_FWD_CORE wxChoice;
class WXDLLIMPEXP_FWD_CORE wxStaticText;
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[];
extern WXDLLIMPEXP_DATA_CORE(const char) wxFileSelectorDefaultWildcardStr[];
//-----------------------------------------------------------------------------
// wxFileData - a class to hold the file info for the wxFileListCtrl
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxFileData
class WXDLLIMPEXP_CORE wxFileData
{
public:
enum fileType
@@ -125,7 +125,7 @@ private:
// wxFileListCtrl
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxFileListCtrl : public wxListCtrl
class WXDLLIMPEXP_CORE wxFileListCtrl : public wxListCtrl
{
public:
wxFileListCtrl();

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

@@ -32,7 +32,7 @@ class WXDLLIMPEXP_FWD_CORE wxFileCtrlEvent;
// wxGenericFileDialog
//-------------------------------------------------------------------------
class WXDLLEXPORT wxGenericFileDialog: public wxFileDialogBase
class WXDLLIMPEXP_CORE wxGenericFileDialog: public wxFileDialogBase
{
public:
wxGenericFileDialog() : wxFileDialogBase() { Init(); }
@@ -128,7 +128,7 @@ private:
#ifdef wxHAS_GENERIC_FILEDIALOG
class WXDLLEXPORT wxFileDialog: public wxGenericFileDialog
class WXDLLIMPEXP_CORE wxFileDialog: public wxGenericFileDialog
{
public:
wxFileDialog() {}

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

@@ -17,8 +17,8 @@
#include "wx/dirdlg.h"
extern WXDLLEXPORT_DATA(const wxEventType) wxEVT_COMMAND_DIRPICKER_CHANGED;
extern WXDLLEXPORT_DATA(const wxEventType) wxEVT_COMMAND_FILEPICKER_CHANGED;
extern WXDLLIMPEXP_DATA_CORE(const wxEventType) wxEVT_COMMAND_DIRPICKER_CHANGED;
extern WXDLLIMPEXP_DATA_CORE(const wxEventType) wxEVT_COMMAND_FILEPICKER_CHANGED;
//-----------------------------------------------------------------------------

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

@@ -44,7 +44,7 @@ enum
wxID_FONT_SIZE
};
class WXDLLEXPORT wxGenericFontDialog : public wxFontDialogBase
class WXDLLIMPEXP_CORE wxGenericFontDialog : public wxFontDialogBase
{
public:
wxGenericFontDialog() { Init(); }

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

@@ -20,7 +20,7 @@ class WXDLLIMPEXP_FWD_CORE wxBitmap;
class WXDLLIMPEXP_FWD_CORE wxColour;
class WXDLLEXPORT wxGenericImageList: public wxObject
class WXDLLIMPEXP_CORE wxGenericImageList: public wxObject
{
public:
wxGenericImageList() { m_width = m_height = 0; }
@@ -64,7 +64,7 @@ private:
* the run-time information.
*/
class WXDLLEXPORT wxImageList: public wxGenericImageList
class WXDLLIMPEXP_CORE wxImageList: public wxGenericImageList
{
DECLARE_DYNAMIC_CLASS(wxImageList)

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

@@ -35,7 +35,7 @@ class WXDLLIMPEXP_FWD_CORE wxListMainWindow;
// wxListCtrl
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxGenericListCtrl: public wxControl
class WXDLLIMPEXP_CORE wxGenericListCtrl: public wxControl
{
public:
@@ -253,7 +253,7 @@ private:
* the run-time information.
*/
class WXDLLEXPORT wxListCtrl: public wxGenericListCtrl
class WXDLLIMPEXP_CORE wxListCtrl: public wxGenericListCtrl
{
DECLARE_DYNAMIC_CLASS(wxListCtrl)

6
include/wx/generic/logg.h
View File

@@ -23,7 +23,7 @@
#if wxUSE_TEXTCTRL
// log everything to a text window (GUI only of course)
class WXDLLEXPORT wxLogTextCtrl : public wxLog
class WXDLLIMPEXP_CORE wxLogTextCtrl : public wxLog
{
public:
wxLogTextCtrl(wxTextCtrl *pTextCtrl);
@@ -49,7 +49,7 @@ private:
#if wxUSE_LOGGUI
class WXDLLEXPORT wxLogGui : public wxLog
class WXDLLIMPEXP_CORE wxLogGui : public wxLog
{
public:
// ctor
@@ -86,7 +86,7 @@ protected:
#if wxUSE_LOGWINDOW
class WXDLLEXPORT wxLogWindow : public wxLogPassThrough
class WXDLLIMPEXP_CORE wxLogWindow : public wxLogPassThrough
{
public:
wxLogWindow(wxWindow *pParent, // the parent frame (can be NULL)

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

@@ -15,7 +15,7 @@
// generic wxMask implementation
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxMask : public wxMaskBase
class WXDLLIMPEXP_CORE wxMask : public wxMaskBase
{
public:
wxMask() { }

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

@@ -23,7 +23,7 @@
class WXDLLIMPEXP_FWD_CORE wxIcon;
class WXDLLIMPEXP_FWD_CORE wxIconBundle;
extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[];
extern WXDLLIMPEXP_DATA_CORE(const char) wxStatusLineNameStr[];
//-----------------------------------------------------------------------------
@@ -38,7 +38,7 @@ class WXDLLIMPEXP_FWD_CORE wxGenericMDIChildFrame;
// wxGenericMDIParentFrame
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxGenericMDIParentFrame: public wxFrame
class WXDLLIMPEXP_CORE wxGenericMDIParentFrame: public wxFrame
{
public:
wxGenericMDIParentFrame();
@@ -111,7 +111,7 @@ private:
// wxGenericMDIChildFrame
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxGenericMDIChildFrame: public wxPanel
class WXDLLIMPEXP_CORE wxGenericMDIChildFrame: public wxPanel
{
public:
wxGenericMDIChildFrame();
@@ -224,7 +224,7 @@ private:
// wxGenericMDIClientWindow
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxGenericMDIClientWindow: public wxNotebook
class WXDLLIMPEXP_CORE wxGenericMDIClientWindow: public wxNotebook
{
public:
wxGenericMDIClientWindow();
@@ -266,7 +266,7 @@ class wxMDIChildFrame ;
// wxMDIParentFrame
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxMDIParentFrame: public wxGenericMDIParentFrame
class WXDLLIMPEXP_CORE wxMDIParentFrame: public wxGenericMDIParentFrame
{
public:
wxMDIParentFrame() {}
@@ -292,7 +292,7 @@ private:
// wxMDIChildFrame
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxMDIChildFrame: public wxGenericMDIChildFrame
class WXDLLIMPEXP_CORE wxMDIChildFrame: public wxGenericMDIChildFrame
{
public:
wxMDIChildFrame() {}
@@ -315,7 +315,7 @@ private:
// wxMDIClientWindow
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxMDIClientWindow: public wxGenericMDIClientWindow
class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxGenericMDIClientWindow
{
public:
wxMDIClientWindow() {}

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

@@ -12,7 +12,7 @@
#ifndef _WX_GENERIC_MSGDLGG_H_
#define _WX_GENERIC_MSGDLGG_H_
class WXDLLEXPORT wxGenericMessageDialog : public wxMessageDialogBase
class WXDLLIMPEXP_CORE wxGenericMessageDialog : public wxMessageDialogBase
{
public:
wxGenericMessageDialog(wxWindow *parent,

20
include/wx/generic/numdlgg.h
View File

@@ -28,7 +28,7 @@
// wxNumberEntryDialog: a dialog with spin control, [ok] and [cancel] buttons
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxNumberEntryDialog : public wxDialog
class WXDLLIMPEXP_CORE wxNumberEntryDialog : public wxDialog
{
public:
wxNumberEntryDialog(wxWindow *parent,
@@ -64,15 +64,15 @@ private:
// function to get a number from user
// ----------------------------------------------------------------------------
long WXDLLEXPORT
wxGetNumberFromUser(const wxString& message,
const wxString& prompt,
const wxString& caption,
long value = 0,
long min = 0,
long max = 100,
wxWindow *parent = (wxWindow *)NULL,
const wxPoint& pos = wxDefaultPosition);
WXDLLIMPEXP_CORE long
wxGetNumberFromUser(const wxString& message,
const wxString& prompt,
const wxString& caption,
long value = 0,
long min = 0,
long max = 100,
wxWindow *parent = (wxWindow *)NULL,
const wxPoint& pos = wxDefaultPosition);
#endif // wxUSE_NUMBERDLG

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

@@ -21,13 +21,13 @@
class WXDLLIMPEXP_FWD_CORE wxControlContainer;
extern WXDLLEXPORT_DATA(const char) wxPanelNameStr[];
extern WXDLLIMPEXP_DATA_CORE(const char) wxPanelNameStr[];
// ----------------------------------------------------------------------------
// wxPanel contains other controls and implements TAB traversal between them
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxPanel : public wxWindow
class WXDLLIMPEXP_CORE wxPanel : public wxWindow
{
public:
wxPanel() { Init(); }

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

@@ -21,7 +21,7 @@
// Represents the printer: manages printing a wxPrintout object
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxPostScriptPrinter : public wxPrinterBase
class WXDLLIMPEXP_CORE wxPostScriptPrinter : public wxPrinterBase
{
public:
wxPostScriptPrinter(wxPrintDialogData *data = (wxPrintDialogData *) NULL);
@@ -40,7 +40,7 @@ private:
// wxPrintout.
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxPostScriptPrintPreview : public wxPrintPreviewBase
class WXDLLIMPEXP_CORE wxPostScriptPrintPreview : public wxPrintPreviewBase
{
public:
wxPostScriptPrintPreview(wxPrintout *printout,

8
include/wx/generic/prntdlgg.h
View File

@@ -78,7 +78,7 @@ enum
// wxPostScriptNativeData
//----------------------------------------------------------------------------
class WXDLLEXPORT wxPostScriptPrintNativeData: public wxPrintNativeDataBase
class WXDLLIMPEXP_CORE wxPostScriptPrintNativeData: public wxPrintNativeDataBase
{
public:
wxPostScriptPrintNativeData();
@@ -137,7 +137,7 @@ private:
// Windows using PostScript print/preview)
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxGenericPrintDialog : public wxPrintDialogBase
class WXDLLIMPEXP_CORE wxGenericPrintDialog : public wxPrintDialogBase
{
public:
wxGenericPrintDialog(wxWindow *parent,
@@ -182,7 +182,7 @@ private:
DECLARE_DYNAMIC_CLASS(wxGenericPrintDialog)
};
class WXDLLEXPORT wxGenericPrintSetupDialog : public wxDialog
class WXDLLIMPEXP_CORE wxGenericPrintSetupDialog : public wxDialog
{
public:
// There are no configuration options for the dialog, so we
@@ -220,7 +220,7 @@ private:
#endif
// wxUSE_POSTSCRIPT
class WXDLLEXPORT wxGenericPageSetupDialog : public wxPageSetupDialogBase
class WXDLLIMPEXP_CORE wxGenericPageSetupDialog : public wxPageSetupDialogBase
{
public:
wxGenericPageSetupDialog(wxWindow *parent = NULL,

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

@@ -26,7 +26,7 @@ class WXDLLIMPEXP_FWD_CORE wxStaticText;
/* Progress dialog which shows a moving progress bar.
Taken from the Mahogany project.*/
class WXDLLEXPORT wxProgressDialog : public wxDialog
class WXDLLIMPEXP_CORE wxProgressDialog : public wxDialog
{
DECLARE_DYNAMIC_CLASS(wxProgressDialog)
public:

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

@@ -12,7 +12,7 @@
#ifndef _WX_GENERIC_REGION_H__
#define _WX_GENERIC_REGION_H__
class WXDLLEXPORT wxRegionGeneric : public wxRegionBase
class WXDLLIMPEXP_CORE wxRegionGeneric : public wxRegionBase
{
public:
wxRegionGeneric(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
@@ -45,7 +45,7 @@ protected:
friend class WXDLLIMPEXP_FWD_CORE wxRegionIteratorGeneric;
};
class WXDLLEXPORT wxRegionIteratorGeneric : public wxObject
class WXDLLIMPEXP_CORE wxRegionIteratorGeneric : public wxObject
{
public:
wxRegionIteratorGeneric();

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

@@ -40,7 +40,7 @@ class wxSpinCtrlTextGeneric; // wxTextCtrl used for the wxSpinCtrlGenericBase
// function ambiguity.
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxSpinCtrlGenericBase : public wxSpinCtrlBase
class WXDLLIMPEXP_CORE wxSpinCtrlGenericBase : public wxSpinCtrlBase
{
public:
wxSpinCtrlGenericBase() { Init(); }
@@ -140,7 +140,7 @@ private:
#include "wx/textctrl.h"
class WXDLLEXPORT wxSpinCtrlGenericBase : public wxTextCtrl
class WXDLLIMPEXP_CORE wxSpinCtrlGenericBase : public wxTextCtrl
{
public:
wxSpinCtrlGenericBase() : m_value(0), m_min(0), m_max(100),

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

@@ -49,7 +49,7 @@ enum
// to prevent flickering. (WS_CLIPCHILDREN doesn't work in all cases so can't be
// standard).
class WXDLLEXPORT wxSplitterWindow: public wxWindow
class WXDLLIMPEXP_CORE wxSplitterWindow: public wxWindow
{
public:
@@ -312,7 +312,7 @@ private:
// usual wxWin convention, but the three event types have different kind of
// data associated with them, so the accessors can be only used if the real
// event type matches with the one for which the accessors make sense
class WXDLLEXPORT wxSplitterEvent : public wxNotifyEvent
class WXDLLIMPEXP_CORE wxSplitterEvent : public wxNotifyEvent
{
public:
wxSplitterEvent(wxEventType type = wxEVT_NULL,

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

@@ -22,7 +22,7 @@ class WXDLLIMPEXP_FWD_CORE wxSearchTextCtrl;
// wxSearchCtrl is a combination of wxTextCtrl and wxSearchButton
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxSearchCtrl : public wxSearchCtrlBase
class WXDLLIMPEXP_CORE wxSearchCtrl : public wxSearchCtrlBase
{
public:
// creation

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

@@ -17,7 +17,7 @@ class wxStaticBox;
// wxStaticLine
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxStaticLine : public wxStaticLineBase
class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase
{
DECLARE_DYNAMIC_CLASS(wxStaticLine)

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

@@ -19,7 +19,7 @@
#include "wx/pen.h"
#include "wx/arrstr.h"
class WXDLLEXPORT wxStatusBarGeneric : public wxStatusBarBase
class WXDLLIMPEXP_CORE wxStatusBarGeneric : public wxStatusBarBase
{
public:
wxStatusBarGeneric() { Init(); }

12
include/wx/generic/tabg.h
View File

@@ -27,7 +27,7 @@ class WXDLLIMPEXP_FWD_CORE wxTabView;
* of the tab.
*/
class WXDLLEXPORT wxTabControl: public wxObject
class WXDLLIMPEXP_CORE wxTabControl: public wxObject
{
DECLARE_DYNAMIC_CLASS(wxTabControl)
public:
@@ -81,7 +81,7 @@ protected:
* are 3 layers in the MS Word Options dialog.
*/
class WXDLLEXPORT wxTabLayer: public wxList
class WXDLLIMPEXP_CORE wxTabLayer: public wxList
{
};
@@ -94,7 +94,7 @@ WX_DECLARE_LIST(wxTabLayer, wxTabLayerList);
#define wxTAB_STYLE_DRAW_BOX 1 // Draws 3D boxes round tab layers
#define wxTAB_STYLE_COLOUR_INTERIOR 2 // Colours interior of tabs, otherwise draws outline
class WXDLLEXPORT wxTabView: public wxObject
class WXDLLIMPEXP_CORE wxTabView: public wxObject
{
DECLARE_DYNAMIC_CLASS(wxTabView)
public:
@@ -266,7 +266,7 @@ protected:
* A dialog box class that is tab-friendly
*/
class WXDLLEXPORT wxTabbedDialog : public wxDialog
class WXDLLIMPEXP_CORE wxTabbedDialog : public wxDialog
{
DECLARE_DYNAMIC_CLASS(wxTabbedDialog)
@@ -298,7 +298,7 @@ private:
* A panel class that is tab-friendly
*/
class WXDLLEXPORT wxTabbedPanel : public wxPanel
class WXDLLIMPEXP_CORE wxTabbedPanel : public wxPanel
{
DECLARE_DYNAMIC_CLASS(wxTabbedPanel)
@@ -327,7 +327,7 @@ private:
WX_DECLARE_HASH_MAP(int, wxWindow*, wxIntegerHash, wxIntegerEqual,
wxIntToWindowHashMap);
class WXDLLEXPORT wxPanelTabView : public wxTabView
class WXDLLIMPEXP_CORE wxPanelTabView : public wxTabView
{
DECLARE_DYNAMIC_CLASS(wxPanelTabView)

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

@@ -25,8 +25,8 @@
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
extern WXDLLEXPORT_DATA(const char) wxGetTextFromUserPromptStr[];
extern WXDLLEXPORT_DATA(const char) wxGetPasswordFromUserPromptStr[];
extern WXDLLIMPEXP_DATA_CORE(const char) wxGetTextFromUserPromptStr[];
extern WXDLLIMPEXP_DATA_CORE(const char) wxGetPasswordFromUserPromptStr[];
#define wxTextEntryDialogStyle (wxOK | wxCANCEL | wxCENTRE | wxWS_EX_VALIDATE_RECURSIVELY)
@@ -34,7 +34,7 @@ extern WXDLLEXPORT_DATA(const char) wxGetPasswordFromUserPromptStr[];
// wxTextEntryDialog: a dialog with text control, [ok] and [cancel] buttons
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxTextEntryDialog : public wxDialog
class WXDLLIMPEXP_CORE wxTextEntryDialog : public wxDialog
{
public:
wxTextEntryDialog(wxWindow *parent,
@@ -72,7 +72,7 @@ private:
// wxPasswordEntryDialog: dialog with password control, [ok] and [cancel]
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxPasswordEntryDialog : public wxTextEntryDialog
class WXDLLIMPEXP_CORE wxPasswordEntryDialog : public wxTextEntryDialog
{
public:
wxPasswordEntryDialog(wxWindow *parent,
@@ -90,23 +90,23 @@ private:
// function to get a string from user
// ----------------------------------------------------------------------------
wxString WXDLLEXPORT
wxGetTextFromUser(const wxString& message,
const wxString& caption = wxGetTextFromUserPromptStr,
const wxString& default_value = wxEmptyString,
wxWindow *parent = (wxWindow *) NULL,
wxCoord x = wxDefaultCoord,
wxCoord y = wxDefaultCoord,
bool centre = true);
WXDLLIMPEXP_CORE wxString
wxGetTextFromUser(const wxString& message,
const wxString& caption = wxGetTextFromUserPromptStr,
const wxString& default_value = wxEmptyString,
wxWindow *parent = (wxWindow *) NULL,
wxCoord x = wxDefaultCoord,
wxCoord y = wxDefaultCoord,
bool centre = true);
wxString WXDLLEXPORT
wxGetPasswordFromUser(const wxString& message,
const wxString& caption = wxGetPasswordFromUserPromptStr,
const wxString& default_value = wxEmptyString,
wxWindow *parent = (wxWindow *) NULL,
wxCoord x = wxDefaultCoord,
wxCoord y = wxDefaultCoord,
bool centre = true);
WXDLLIMPEXP_CORE wxString
wxGetPasswordFromUser(const wxString& message,
const wxString& caption = wxGetPasswordFromUserPromptStr,
const wxString& default_value = wxEmptyString,
wxWindow *parent = (wxWindow *) NULL,
wxCoord x = wxDefaultCoord,
wxCoord y = wxDefaultCoord,
bool centre = true);
#endif
// wxUSE_TEXTDLG

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

@@ -34,7 +34,7 @@ class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
// wxGenericTreeCtrl - the tree control
// -----------------------------------------------------------------------------
class WXDLLEXPORT wxGenericTreeCtrl : public wxTreeCtrlBase,
class WXDLLIMPEXP_CORE wxGenericTreeCtrl : public wxTreeCtrlBase,
public wxScrollHelper
{
public:
@@ -350,7 +350,7 @@ private:
* the run-time information.
*/
class WXDLLEXPORT wxTreeCtrl: public wxGenericTreeCtrl
class WXDLLIMPEXP_CORE wxTreeCtrl: public wxGenericTreeCtrl
{
DECLARE_DYNAMIC_CLASS(wxTreeCtrl)