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

6
include/wx/os2/accel.h
View File

@@ -28,7 +28,7 @@ class WXDLLIMPEXP_FWD_CORE wxAcceleratorTable;
// Hold no key down
#define wxACCEL_NORMAL 0x00
class WXDLLEXPORT wxAcceleratorTable: public wxObject
class WXDLLIMPEXP_CORE wxAcceleratorTable: public wxObject
{
DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
public:
@@ -51,8 +51,8 @@ public:
) const;
};
WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;
WXDLLIMPEXP_DATA_CORE(extern wxAcceleratorTable) wxNullAcceleratorTable;
WXDLLEXPORT wxString wxPMTextToLabel(const wxString& rsTitle);
WXDLLIMPEXP_CORE wxString wxPMTextToLabel(const wxString& rsTitle);
#endif
// _WX_ACCEL_H_

10
include/wx/os2/app.h
View File

@@ -43,14 +43,14 @@ class WXDLLIMPEXP_FWD_CORE wxApp;
class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
class WXDLLIMPEXP_FWD_BASE wxLog;
WXDLLEXPORT_DATA(extern wxApp*) wxTheApp;
WXDLLEXPORT_DATA(extern HAB) vHabmain;
WXDLLIMPEXP_DATA_CORE(extern wxApp*) wxTheApp;
WXDLLIMPEXP_DATA_CORE(extern HAB) vHabmain;
// Force an exit from main loop
void WXDLLEXPORT wxExit(void);
void WXDLLIMPEXP_CORE wxExit(void);
// Yield to other apps/messages
bool WXDLLEXPORT wxYield(void);
bool WXDLLIMPEXP_CORE wxYield(void);
extern MRESULT EXPENTRY wxWndProc( HWND
,ULONG
@@ -61,7 +61,7 @@ extern MRESULT EXPENTRY wxWndProc( HWND
// Represents the application. Derive OnInit and declare
// a new App object to start application
class WXDLLEXPORT wxApp : public wxAppBase
class WXDLLIMPEXP_CORE wxApp : public wxAppBase
{
DECLARE_DYNAMIC_CLASS(wxApp)

8
include/wx/os2/bitmap.h
View File

@@ -34,7 +34,7 @@ class WXDLLIMPEXP_FWD_CORE wxImage;
// wxBitmap functions accessing it
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxBitmapRefData : public wxGDIImageRefData
class WXDLLIMPEXP_CORE wxBitmapRefData : public wxGDIImageRefData
{
public:
wxBitmapRefData();
@@ -63,7 +63,7 @@ public:
// wxBitmap: a mono or colour bitmap
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxBitmap : public wxGDIImage
class WXDLLIMPEXP_CORE wxBitmap : public wxGDIImage
{
public:
// default ctor creates an invalid bitmap, you must Create() it later
@@ -229,7 +229,7 @@ private:
// wxMask: a mono bitmap used for drawing bitmaps transparently.
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxMask : public wxObject
class WXDLLIMPEXP_CORE wxMask : public wxObject
{
public:
wxMask();
@@ -279,7 +279,7 @@ protected:
// wxBitmapHandler is a class which knows how to load/save bitmaps to/from file
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxBitmapHandler : public wxGDIImageHandler
class WXDLLIMPEXP_CORE wxBitmapHandler : public wxGDIImageHandler
{
public:
inline wxBitmapHandler()

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

@@ -15,11 +15,11 @@
#include "wx/button.h"
#include "wx/dcclient.h"
WXDLLEXPORT_DATA(extern const char) wxButtonNameStr[];
WXDLLIMPEXP_DATA_CORE(extern const char) wxButtonNameStr[];
#define wxDEFAULT_BUTTON_MARGIN 4
class WXDLLEXPORT wxBitmapButton: public wxBitmapButtonBase
class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase
{
public:
inline wxBitmapButton()

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

@@ -15,7 +15,7 @@
#include "wx/bitmap.h"
// Brush
class WXDLLEXPORT wxBrush: public wxBrushBase
class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase
{
public:
wxBrush();

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

@@ -15,7 +15,7 @@
#include "wx/control.h"
// Pushbutton
class WXDLLEXPORT wxButton: public wxButtonBase
class WXDLLIMPEXP_CORE wxButton: public wxButtonBase
{
public:
inline wxButton() {}

4
include/wx/os2/checkbox.h
View File

@@ -16,7 +16,7 @@
// Checkbox item (single checkbox)
class WXDLLIMPEXP_FWD_CORE wxBitmap;
class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase
class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase
{
public:
inline wxCheckBox() { }
@@ -66,7 +66,7 @@ private:
DECLARE_DYNAMIC_CLASS(wxCheckBox)
};
class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
class WXDLLIMPEXP_CORE wxBitmapCheckBox: public wxCheckBox
{
public:

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

@@ -19,7 +19,7 @@
class wxOwnerDrawn; // so the compiler knows, it is a class.
class WXDLLEXPORT wxCheckListBox : public wxCheckListBoxBase
class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase
{
public:
//

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

@@ -16,7 +16,7 @@
// Choice item
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxChoice: public wxChoiceBase
class WXDLLIMPEXP_CORE wxChoice: public wxChoiceBase
{
DECLARE_DYNAMIC_CLASS(wxChoice)

22
include/wx/os2/clipbrd.h
View File

@@ -25,24 +25,24 @@
// implement wxClipboard, and for compatibility.
// open/close the clipboard
WXDLLEXPORT bool wxOpenClipboard();
WXDLLEXPORT bool wxIsClipboardOpened();
WXDLLIMPEXP_CORE bool wxOpenClipboard();
WXDLLIMPEXP_CORE bool wxIsClipboardOpened();
#define wxClipboardOpen wxIsClipboardOpened
WXDLLEXPORT bool wxCloseClipboard();
WXDLLIMPEXP_CORE bool wxCloseClipboard();
// get/set data
WXDLLEXPORT bool wxEmptyClipboard();
WXDLLEXPORT bool wxSetClipboardData(wxDataFormat dataFormat,
WXDLLIMPEXP_CORE bool wxEmptyClipboard();
WXDLLIMPEXP_CORE bool wxSetClipboardData(wxDataFormat dataFormat,
const void *data,
int width = 0, int height = 0);
WXDLLEXPORT void* wxGetClipboardData(wxDataFormat dataFormat,
WXDLLIMPEXP_CORE void* wxGetClipboardData(wxDataFormat dataFormat,
long *len = NULL);
// clipboard formats
WXDLLEXPORT bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat);
WXDLLEXPORT wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat);
WXDLLEXPORT int wxRegisterClipboardFormat(wxChar *formatName);
WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat,
WXDLLIMPEXP_CORE bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat);
WXDLLIMPEXP_CORE wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat);
WXDLLIMPEXP_CORE int wxRegisterClipboardFormat(wxChar *formatName);
WXDLLIMPEXP_CORE bool wxGetClipboardFormatName(wxDataFormat dataFormat,
wxChar *formatName,
int maxCount);
@@ -51,7 +51,7 @@ WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat,
//-----------------------------------------------------------------------------
class WXDLLIMPEXP_FWD_CORE wxDataObject;
class WXDLLEXPORT wxClipboard : public wxClipboardBase
class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase
{
DECLARE_DYNAMIC_CLASS(wxClipboard)

2
include/wx/os2/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/os2/combobox.h
View File

@@ -18,7 +18,7 @@
#if wxUSE_COMBOBOX
// Combobox item
class WXDLLEXPORT wxComboBox : public wxChoice,
class WXDLLIMPEXP_CORE wxComboBox : public wxChoice,
public wxTextEntry
{

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

@@ -15,7 +15,7 @@
#include "wx/dynarray.h"
// General item class
class WXDLLEXPORT wxControl : public wxControlBase
class WXDLLIMPEXP_CORE wxControl : public wxControlBase
{
DECLARE_ABSTRACT_CLASS(wxControl)

4
include/wx/os2/cursor.h
View File

@@ -14,7 +14,7 @@
#include "wx/bitmap.h"
class WXDLLEXPORT wxCursorRefData: public wxGDIImageRefData
class WXDLLIMPEXP_CORE wxCursorRefData: public wxGDIImageRefData
{
public:
wxCursorRefData();
@@ -27,7 +27,7 @@ public:
#define M_CURSORHANDLERDATA ((wxCursorRefData *)bitmap->m_refData)
// Cursor
class WXDLLEXPORT wxCursor: public wxBitmap
class WXDLLIMPEXP_CORE wxCursor: public wxBitmap
{
public:
wxCursor();

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

@@ -97,7 +97,7 @@ public:
// this is an ABC: use one of the derived classes to create a DC associated
// with a window, screen, printer and so on
class WXDLLEXPORT wxPMDCImpl : public wxDCImpl
class WXDLLIMPEXP_CORE wxPMDCImpl : public wxDCImpl
{
DECLARE_DYNAMIC_CLASS(wxDC)

6
include/wx/os2/dcclient.h
View File

@@ -34,7 +34,7 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
// DC classes
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxWindowDCImpl : public wxPMDCImpl
class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxPMDCImpl
{
public:
// default ctor
@@ -55,7 +55,7 @@ private:
DECLARE_NO_COPY_CLASS(wxWindowDCImpl)
}; // end of CLASS wxWindowDC
class WXDLLEXPORT wxClientDCImpl : public wxWindowDCImpl
class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl
{
public:
// default ctor
@@ -76,7 +76,7 @@ private:
DECLARE_NO_COPY_CLASS(wxClientDCImpl)
}; // end of CLASS wxClientDC
class WXDLLEXPORT wxPaintDCImpl : public wxClientDCImpl
class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl
{
public:
wxPaintDCImpl( wxDC *owner );

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

@@ -15,7 +15,7 @@
#include "wx/dcmemory.h"
#include "wx/os2/dc.h"
class WXDLLEXPORT wxMemoryDCImpl: public wxPMDCImpl
class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxPMDCImpl
{
public:
wxMemoryDCImpl( wxMemoryDC *owner );

4
include/wx/os2/dcprint.h
View File

@@ -18,7 +18,7 @@
#include "wx/cmndata.h"
#include "wx/os2/dc.h"
class WXDLLEXPORT wxPrinterDCImpl: public wxPMDCImpl
class WXDLLIMPEXP_CORE wxPrinterDCImpl: public wxPMDCImpl
{
public:
// Create a printer DC
@@ -64,7 +64,7 @@ private:
}; // end of CLASS wxPrinterDC
// Gets an HDC for the specified printer configuration
WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& rData);
WXHDC WXDLLIMPEXP_CORE wxGetPrinterDC(const wxPrintData& rData);
#endif // wxUSE_PRINTING_ARCHITECTURE

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

@@ -15,7 +15,7 @@
#include "wx/dcscreen.h"
#include "wx/os2/dc.h"
class WXDLLEXPORT wxScreenDCImpl: public wxPMDCImpl
class WXDLLIMPEXP_CORE wxScreenDCImpl: public wxPMDCImpl
{
public:
// Create a DC representing the whole screen

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

@@ -14,14 +14,14 @@
#include "wx/panel.h"
WXDLLEXPORT_DATA(extern const char) wxDialogNameStr[];
WXDLLIMPEXP_DATA_CORE(extern const char) wxDialogNameStr[];
class WXDLLIMPEXP_FWD_CORE wxDialogModalData;
//
// Dialog boxes
//
class WXDLLEXPORT wxDialog: public wxDialogBase
class WXDLLIMPEXP_CORE wxDialog: public wxDialogBase
{
public:

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

@@ -14,9 +14,9 @@
#include "wx/dialog.h"
WXDLLEXPORT_DATA(extern const wxChar) wxFileSelectorPromptStr[];
WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxFileSelectorPromptStr[];
class WXDLLEXPORT wxDirDialog: public wxDirDialogBase
class WXDLLIMPEXP_CORE wxDirDialog: public wxDirDialogBase
{
DECLARE_DYNAMIC_CLASS(wxDirDialog)
public:

4
include/wx/os2/dnd.h
View File

@@ -29,7 +29,7 @@ class CIDropTarget;
// wxDropSource
//-------------------------------------------------------------------------
class WXDLLEXPORT wxDropSource: public wxDropSourceBase
class WXDLLIMPEXP_CORE wxDropSource: public wxDropSourceBase
{
public:
/* constructor. set data later with SetData() */
@@ -59,7 +59,7 @@ protected:
// wxDropTarget
//-------------------------------------------------------------------------
class WXDLLEXPORT wxDropTarget : public wxDropTargetBase
class WXDLLIMPEXP_CORE wxDropTarget : public wxDropTargetBase
{
public:
wxDropTarget(wxDataObject* pDataObject = (wxDataObject*)NULL);

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

@@ -16,7 +16,7 @@
// wxFileDialog
//-------------------------------------------------------------------------
class WXDLLEXPORT wxFileDialog: public wxFileDialogBase
class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase
{
DECLARE_DYNAMIC_CLASS(wxFileDialog)
public:

4
include/wx/os2/font.h
View File

@@ -15,13 +15,13 @@
#include "wx/gdiobj.h"
#include "wx/os2/private.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxEmptyString;
// ----------------------------------------------------------------------------
// wxFont
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxFont : public wxFontBase
class WXDLLIMPEXP_CORE wxFont : public wxFontBase
{
public:
// ctors and such

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

@@ -20,7 +20,7 @@
* Font dialog
*/
class WXDLLEXPORT wxFontDialog: public wxFontDialogBase
class WXDLLIMPEXP_CORE wxFontDialog: public wxFontDialogBase
{
public:
wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ }

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

@@ -17,7 +17,7 @@
//
#include "wx/os2/wxrsc.h"
class WXDLLEXPORT wxFrame : public wxFrameBase
class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase
{
public:
// construction

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

@@ -12,7 +12,7 @@
#ifndef _WX_GAUGE_H_
#define _WX_GAUGE_H_
class WXDLLEXPORT wxGauge: public wxGaugeBase
class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase
{
public:
inline wxGauge() { m_nRangeMax = 0; m_nGaugePos = 0; }

6
include/wx/os2/gdiimage.h
View File

@@ -30,7 +30,7 @@ WX_DECLARE_EXPORTED_LIST(wxGDIImageHandler, wxGDIImageHandlerList);
// wxGDIImageRefData: common data fields for all derived classes
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxGDIImageRefData : public wxGDIRefData
class WXDLLIMPEXP_CORE wxGDIImageRefData : public wxGDIRefData
{
public:
wxGDIImageRefData()
@@ -81,7 +81,7 @@ public:
// wxGDIImageHandler: a class which knows how to load/save wxGDIImages.
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxGDIImageHandler : public wxObject
class WXDLLIMPEXP_CORE wxGDIImageHandler : public wxObject
{
public:
// ctor
@@ -143,7 +143,7 @@ protected:
// format. It also falls back to wxImage if no appropriate image is found.
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxGDIImage : public wxGDIObject
class WXDLLIMPEXP_CORE wxGDIImage : public wxGDIObject
{
public:
// handlers list interface

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

@@ -18,7 +18,7 @@
#include "wx/helpbase.h"
class WXDLLEXPORT wxWinHelpController: public wxHelpControllerBase
class WXDLLIMPEXP_CORE wxWinHelpController: public wxHelpControllerBase
{
DECLARE_CLASS(wxWinHelpController)

4
include/wx/os2/icon.h
View File

@@ -22,7 +22,7 @@
#define wxIconRefDataBase wxGDIImageRefData
#define wxIconBase wxGDIImage
class WXDLLEXPORT wxIconRefData: public wxIconRefDataBase
class WXDLLIMPEXP_CORE wxIconRefData: public wxIconRefDataBase
{
public:
wxIconRefData() { };
@@ -35,7 +35,7 @@ public:
// Icon
// ---------------------------------------------------------------------------
class WXDLLEXPORT wxIcon: public wxIconBase
class WXDLLIMPEXP_CORE wxIcon: public wxIconBase
{
public:
wxIcon();

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

@@ -35,7 +35,7 @@
// same as appname). The file name (strAppName parameter) may, in fact,
// contain the full path to the file. If it doesn't, the file is searched for
// in the Windows directory.
class WXDLLEXPORT wxIniConfig : public wxConfigBase
class WXDLLIMPEXP_CORE wxIniConfig : public wxConfigBase
{
public:
// ctor & dtor

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

@@ -32,7 +32,7 @@ class wxArrayInt;
// List box control
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxListBox : public wxListBoxBase
class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase
{
public:
// ctors and such

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

@@ -24,7 +24,7 @@ class WXDLLIMPEXP_FWD_CORE wxImageList;
typedef int (wxCALLBACK *wxListCtrlCompare)(long lItem1, long lItem2, long lSortData);
class WXDLLEXPORT wxListCtrl: public wxControl
class WXDLLIMPEXP_CORE wxListCtrl: public wxControl
{
public:
wxListCtrl() { Init(); }

6
include/wx/os2/mdi.h
View File

@@ -19,7 +19,7 @@
class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow;
class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
class WXDLLEXPORT wxMDIParentFrame: public wxFrame
class WXDLLIMPEXP_CORE wxMDIParentFrame: public wxFrame
{
DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
@@ -103,7 +103,7 @@ private:
DECLARE_EVENT_TABLE()
};
class WXDLLEXPORT wxMDIChildFrame: public wxFrame
class WXDLLIMPEXP_CORE wxMDIChildFrame: public wxFrame
{
DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
public:
@@ -164,7 +164,7 @@ protected:
* of the children. Phew! So the children are sort of 'adopted'...
*/
class WXDLLEXPORT wxMDIClientWindow: public wxWindow
class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxWindow
{
DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)

4
include/wx/os2/menu.h
View File

@@ -28,7 +28,7 @@ void wxSetShortCutKey(wxChar* zText);
// Menu
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxMenu : public wxMenuBase
class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase
{
public:
//
@@ -172,7 +172,7 @@ private:
// Menu Bar (a la Windows)
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxMenuBar : public wxMenuBarBase
class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase
{
public:
//

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

@@ -33,7 +33,7 @@
// ----------------------------------------------------------------------------
// wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxMenuItem: public wxMenuItemBase
class WXDLLIMPEXP_CORE wxMenuItem: public wxMenuItemBase
#if wxUSE_OWNER_DRAWN
, public wxOwnerDrawn
#endif

14
include/wx/os2/metafile.h
View File

@@ -33,7 +33,7 @@
class WXDLLIMPEXP_FWD_CORE wxMetafile;
class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData
class WXDLLIMPEXP_CORE wxMetafileRefData: public wxGDIRefData
{
friend class WXDLLIMPEXP_FWD_CORE wxMetafile;
public:
@@ -49,7 +49,7 @@ public:
#define M_METAFILEDATA ((wxMetafileRefData *)m_refData)
class WXDLLEXPORT wxMetafile: public wxGDIObject
class WXDLLIMPEXP_CORE wxMetafile: public wxGDIObject
{
DECLARE_DYNAMIC_CLASS(wxMetafile)
public:
@@ -73,7 +73,7 @@ protected:
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
};
class WXDLLEXPORT wxMetafileDCImpl: public wxPMDCImpl
class WXDLLIMPEXP_CORE wxMetafileDCImpl: public wxPMDCImpl
{
public:
wxMetafileDCImpl(wxDC *owner, const wxString& file = wxEmptyString);
@@ -106,7 +106,7 @@ private:
DECLARE_NO_COPY_CLASS(wxMetafileDCImpl)
};
class WXDLLEXPORT wxMetafileDC: public wxDC
class WXDLLIMPEXP_CORE wxMetafileDC: public wxDC
{
public:
// Don't supply origin and extent
@@ -148,10 +148,10 @@ private:
// No origin or extent
#define wxMakeMetaFilePlaceable wxMakeMetafilePlaceable
bool WXDLLEXPORT wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0);
bool WXDLLIMPEXP_CORE wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0);
// Optional origin and extent
bool WXDLLEXPORT wxMakeMetaFilePlaceable( const wxString& filename
bool WXDLLIMPEXP_CORE wxMakeMetaFilePlaceable( const wxString& filename
,int x1
,int y1
,int x2
@@ -168,7 +168,7 @@ bool WXDLLEXPORT wxMakeMetaFilePlaceable( const wxString& filename
// use.
#if wxUSE_DRAG_AND_DROP
class WXDLLEXPORT wxMetafileDataObject : public wxDataObject
class WXDLLIMPEXP_CORE wxMetafileDataObject : public wxDataObject
{
public:
// ctors

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

@@ -16,7 +16,7 @@
#include "wx/frame.h"
class WXDLLEXPORT wxMiniFrame: public wxFrame {
class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame {
DECLARE_DYNAMIC_CLASS(wxMiniFrame)

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

@@ -13,7 +13,7 @@
#ifndef _WX_MSGBOXDLG_H_
#define _WX_MSGBOXDLG_H_
class WXDLLEXPORT wxMessageDialog : public wxMessageDialogBase
class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase
{
public:
wxMessageDialog( wxWindow* pParent

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

@@ -23,7 +23,7 @@
// wxNotebook
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxNotebook : public wxNotebookBase
class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase
{
public:
//

4
include/wx/os2/palette.h
View File

@@ -17,7 +17,7 @@
class WXDLLIMPEXP_FWD_CORE wxPalette;
class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
class WXDLLIMPEXP_CORE wxPaletteRefData: public wxGDIRefData
{
friend class WXDLLIMPEXP_FWD_CORE wxPalette;
public:
@@ -30,7 +30,7 @@ public:
#define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
class WXDLLEXPORT wxPalette: public wxPaletteBase
class WXDLLIMPEXP_CORE wxPalette: public wxPaletteBase
{
public:
wxPalette();

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

@@ -21,7 +21,7 @@ typedef long wxPMDash;
// Pen
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxPen : public wxPenBase
class WXDLLIMPEXP_CORE wxPen : public wxPenBase
{
public:
wxPen() { }

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

@@ -12,7 +12,7 @@
#ifndef _WX_PNGHAND_H_
#define _WX_PNGHAND_H_
class WXDLLEXPORT wxPNGFileHandler: public wxBitmapHandler
class WXDLLIMPEXP_CORE wxPNGFileHandler: public wxBitmapHandler
{
DECLARE_DYNAMIC_CLASS(wxPNGFileHandler)
public:

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

@@ -16,7 +16,7 @@
// wxPopupWindow
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxPopupWindow : public wxPopupWindowBase
class WXDLLIMPEXP_CORE wxPopupWindow : public wxPopupWindowBase
{
public:
wxPopupWindow() { }

4
include/wx/os2/print.h
View File

@@ -18,7 +18,7 @@
* Represents the printer: manages printing a wxPrintout object
*/
class WXDLLEXPORT wxOS2Printer: public wxPrinterBase
class WXDLLIMPEXP_CORE wxOS2Printer: public wxPrinterBase
{
DECLARE_DYNAMIC_CLASS(wxPrinter)
@@ -37,7 +37,7 @@ private:
* Programmer creates an object of this class to preview a wxPrintout.
*/
class WXDLLEXPORT wxOS2PrintPreview: public wxPrintPreviewBase
class WXDLLIMPEXP_CORE wxOS2PrintPreview: public wxPrintPreviewBase
{
DECLARE_CLASS(wxPrintPreview)

4
include/wx/os2/printos2.h
View File

@@ -20,7 +20,7 @@
* Represents the printer: manages printing a wxPrintout object
*/
class WXDLLEXPORT wxOS2Printer: public wxPrinterBase
class WXDLLIMPEXP_CORE wxOS2Printer: public wxPrinterBase
{
DECLARE_DYNAMIC_CLASS(wxOS2Printer)
@@ -39,7 +39,7 @@ private:
* Programmer creates an object of this class to preview a wxPrintout.
*/
class WXDLLEXPORT wxOS2PrintPreview: public wxPrintPreviewBase
class WXDLLIMPEXP_CORE wxOS2PrintPreview: public wxPrintPreviewBase
{
DECLARE_CLASS(wxOS2PrintPreview)

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

@@ -94,50 +94,50 @@ class WXDLLIMPEXP_FWD_CORE wxBitmap;
//
// Controls
//
WXDLLEXPORT_DATA(extern const char) wxButtonNameStr[];
WXDLLEXPORT_DATA(extern const char) wxCheckBoxNameStr[];
WXDLLEXPORT_DATA(extern const char) wxChoiceNameStr[];
WXDLLEXPORT_DATA(extern const char) wxComboBoxNameStr[];
WXDLLEXPORT_DATA(extern const char) wxDialogNameStr[];
WXDLLEXPORT_DATA(extern const char) wxFrameNameStr[];
WXDLLEXPORT_DATA(extern const char) wxGaugeNameStr[];
WXDLLEXPORT_DATA(extern const char) wxStaticBoxNameStr[];
WXDLLEXPORT_DATA(extern const char) wxListBoxNameStr[];
WXDLLEXPORT_DATA(extern const char) wxStaticLineNameStr[];
WXDLLEXPORT_DATA(extern const char) wxStaticTextNameStr[];
WXDLLEXPORT_DATA(extern const char) wxStaticBitmapNameStr[];
WXDLLEXPORT_DATA(extern const char) wxPanelNameStr[];
WXDLLEXPORT_DATA(extern const char) wxRadioBoxNameStr[];
WXDLLEXPORT_DATA(extern const char) wxRadioButtonNameStr[];
WXDLLEXPORT_DATA(extern const char) wxBitmapRadioButtonNameStr[];
WXDLLEXPORT_DATA(extern const char) wxScrollBarNameStr[];
WXDLLEXPORT_DATA(extern const char) wxSliderNameStr[];
WXDLLEXPORT_DATA(extern const char) wxTextCtrlNameStr[];
WXDLLEXPORT_DATA(extern const char) wxToolBarNameStr[];
WXDLLEXPORT_DATA(extern const char) wxStatusLineNameStr[];
WXDLLEXPORT_DATA(extern const char) wxGetTextFromUserPromptStr[];
WXDLLEXPORT_DATA(extern const char) wxMessageBoxCaptionStr[];
WXDLLEXPORT_DATA(extern const char) wxFileSelectorPromptStr[];
WXDLLEXPORT_DATA(extern const char) wxFileSelectorDefaultWildcardStr[];
WXDLLEXPORT_DATA(extern const wxChar*) wxInternalErrorStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxFatalErrorStr;
WXDLLEXPORT_DATA(extern const char) wxTreeCtrlNameStr[];
WXDLLEXPORT_DATA(extern const char) wxDirDialogNameStr[];
WXDLLEXPORT_DATA(extern const char) wxDirDialogDefaultFolderStr[];
WXDLLIMPEXP_DATA_CORE(extern const char) wxButtonNameStr[];
WXDLLIMPEXP_DATA_CORE(extern const char) wxCheckBoxNameStr[];
WXDLLIMPEXP_DATA_CORE(extern const char) wxChoiceNameStr[];
WXDLLIMPEXP_DATA_CORE(extern const char) wxComboBoxNameStr[];
WXDLLIMPEXP_DATA_CORE(extern const char) wxDialogNameStr[];
WXDLLIMPEXP_DATA_CORE(extern const char) wxFrameNameStr[];
WXDLLIMPEXP_DATA_CORE(extern const char) wxGaugeNameStr[];
WXDLLIMPEXP_DATA_CORE(extern const char) wxStaticBoxNameStr[];
WXDLLIMPEXP_DATA_CORE(extern const char) wxListBoxNameStr[];
WXDLLIMPEXP_DATA_CORE(extern const char) wxStaticLineNameStr[];
WXDLLIMPEXP_DATA_CORE(extern const char) wxStaticTextNameStr[];
WXDLLIMPEXP_DATA_CORE(extern const char) wxStaticBitmapNameStr[];
WXDLLIMPEXP_DATA_CORE(extern const char) wxPanelNameStr[];
WXDLLIMPEXP_DATA_CORE(extern const char) wxRadioBoxNameStr[];
WXDLLIMPEXP_DATA_CORE(extern const char) wxRadioButtonNameStr[];
WXDLLIMPEXP_DATA_CORE(extern const char) wxBitmapRadioButtonNameStr[];
WXDLLIMPEXP_DATA_CORE(extern const char) wxScrollBarNameStr[];
WXDLLIMPEXP_DATA_CORE(extern const char) wxSliderNameStr[];
WXDLLIMPEXP_DATA_CORE(extern const char) wxTextCtrlNameStr[];
WXDLLIMPEXP_DATA_CORE(extern const char) wxToolBarNameStr[];
WXDLLIMPEXP_DATA_CORE(extern const char) wxStatusLineNameStr[];
WXDLLIMPEXP_DATA_CORE(extern const char) wxGetTextFromUserPromptStr[];
WXDLLIMPEXP_DATA_CORE(extern const char) wxMessageBoxCaptionStr[];
WXDLLIMPEXP_DATA_CORE(extern const char) wxFileSelectorPromptStr[];
WXDLLIMPEXP_DATA_CORE(extern const char) wxFileSelectorDefaultWildcardStr[];
WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxInternalErrorStr;
WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxFatalErrorStr;
WXDLLIMPEXP_DATA_CORE(extern const char) wxTreeCtrlNameStr[];
WXDLLIMPEXP_DATA_CORE(extern const char) wxDirDialogNameStr[];
WXDLLIMPEXP_DATA_CORE(extern const char) wxDirDialogDefaultFolderStr[];
//
// Class names
//
WXDLLEXPORT_DATA(extern const wxChar*) wxFrameClassName;
WXDLLEXPORT_DATA(extern const wxChar*) wxFrameClassNameNoRedraw;
WXDLLEXPORT_DATA(extern const wxChar*) wxMDIFrameClassName;
WXDLLEXPORT_DATA(extern const wxChar*) wxMDIFrameClassNameNoRedraw;
WXDLLEXPORT_DATA(extern const wxChar*) wxMDIChildFrameClassName;
WXDLLEXPORT_DATA(extern const wxChar*) wxMDIChildFrameClassNameNoRedraw;
WXDLLEXPORT_DATA(extern const wxChar*) wxPanelClassName;
WXDLLEXPORT_DATA(extern const wxChar*) wxPanelClassNameNR;
WXDLLEXPORT_DATA(extern const wxChar*) wxCanvasClassName;
WXDLLEXPORT_DATA(extern const wxChar*) wxCanvasClassNameNR;
WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxFrameClassName;
WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxFrameClassNameNoRedraw;
WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxMDIFrameClassName;
WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxMDIFrameClassNameNoRedraw;
WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxMDIChildFrameClassName;
WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxMDIChildFrameClassNameNoRedraw;
WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxPanelClassName;
WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxPanelClassNameNR;
WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxCanvasClassName;
WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxCanvasClassNameNR;
// ---------------------------------------------------------------------------
// standard icons from the resources
@@ -145,13 +145,13 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxCanvasClassNameNR;
#ifdef __WXPM__
WXDLLEXPORT_DATA(extern HICON) wxSTD_FRAME_ICON;
WXDLLEXPORT_DATA(extern HICON) wxSTD_MDIPARENTFRAME_ICON;
WXDLLEXPORT_DATA(extern HICON) wxSTD_MDICHILDFRAME_ICON;
WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_FRAME_ICON;
WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_MDIPARENTFRAME_ICON;
WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_MDICHILDFRAME_ICON;
WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
WXDLLIMPEXP_DATA_CORE(extern HICON) wxSTD_FRAME_ICON;
WXDLLIMPEXP_DATA_CORE(extern HICON) wxSTD_MDIPARENTFRAME_ICON;
WXDLLIMPEXP_DATA_CORE(extern HICON) wxSTD_MDICHILDFRAME_ICON;
WXDLLIMPEXP_DATA_CORE(extern HICON) wxDEFAULT_FRAME_ICON;
WXDLLIMPEXP_DATA_CORE(extern HICON) wxDEFAULT_MDIPARENTFRAME_ICON;
WXDLLIMPEXP_DATA_CORE(extern HICON) wxDEFAULT_MDICHILDFRAME_ICON;
WXDLLIMPEXP_DATA_CORE(extern HFONT) wxSTATUS_LINE_FONT;
#endif
@@ -296,9 +296,9 @@ extern HBITMAP wxCopyBmp(HBITMAP hbmp, bool flip=false, int w=0, int h=0);
#ifdef __WXPM__
// The MakeProcInstance version of the function wxSubclassedGenericControlProc
WXDLLEXPORT_DATA(extern int) wxGenericControlSubClassProc;
WXDLLEXPORT_DATA(extern wxChar*) wxBuffer;
WXDLLEXPORT_DATA(extern HINSTANCE) wxhInstance;
WXDLLIMPEXP_DATA_CORE(extern int) wxGenericControlSubClassProc;
WXDLLIMPEXP_DATA_CORE(extern wxChar*) wxBuffer;
WXDLLIMPEXP_DATA_CORE(extern HINSTANCE) wxhInstance;
#endif
// ---------------------------------------------------------------------------
@@ -308,10 +308,10 @@ WXDLLEXPORT_DATA(extern HINSTANCE) wxhInstance;
#ifdef __WXPM__
extern "C"
{
WXDLLEXPORT HINSTANCE wxGetInstance();
WXDLLIMPEXP_CORE HINSTANCE wxGetInstance();
}
WXDLLEXPORT void wxSetInstance(HINSTANCE hInst);
WXDLLIMPEXP_CORE void wxSetInstance(HINSTANCE hInst);
#endif
#include "wx/thread.h"
@@ -330,19 +330,19 @@ static inline MRESULT MySendMsg(HWND hwnd, ULONG ulMsgid,
#ifdef __WXPM__
WXDLLEXPORT void wxDrawBorder( HPS hPS
WXDLLIMPEXP_CORE void wxDrawBorder( HPS hPS
,RECTL& rRect
,WXDWORD dwStyle
);
WXDLLEXPORT wxWindow* wxFindWinFromHandle(WXHWND hWnd);
WXDLLIMPEXP_CORE wxWindow* wxFindWinFromHandle(WXHWND hWnd);
WXDLLEXPORT void wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font);
WXDLLIMPEXP_CORE void wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font);
WXDLLEXPORT void wxConvertVectorFontSize( FIXED fxPointSize
WXDLLIMPEXP_CORE void wxConvertVectorFontSize( FIXED fxPointSize
,PFATTRS pFattrs
);
WXDLLEXPORT void wxFillLogFont( LOGFONT* pLogFont
WXDLLIMPEXP_CORE void wxFillLogFont( LOGFONT* pLogFont
,PFACENAMEDESC pFaceName
,HPS* phPS
,bool* pbInternalPS
@@ -350,37 +350,37 @@ WXDLLEXPORT void wxFillLogFont( LOGFONT* pLogFont
,wxString& sFaceName
,wxFont* pFont
);
WXDLLEXPORT wxFontEncoding wxGetFontEncFromCharSet(int nCharSet);
WXDLLEXPORT void wxOS2SelectMatchingFontByName( PFATTRS vFattrs
WXDLLIMPEXP_CORE wxFontEncoding wxGetFontEncFromCharSet(int nCharSet);
WXDLLIMPEXP_CORE void wxOS2SelectMatchingFontByName( PFATTRS vFattrs
,PFACENAMEDESC pFaceName
,PFONTMETRICS pFM
,int nNumFonts
,const wxFont* pFont
);
WXDLLEXPORT wxFont wxCreateFontFromLogFont( LOGFONT* pLogFont
WXDLLIMPEXP_CORE wxFont wxCreateFontFromLogFont( LOGFONT* pLogFont
,PFONTMETRICS pFM
,PFACENAMEDESC pFace
);
WXDLLEXPORT int wxGpiStrcmp(wxChar* s0, wxChar* s1);
WXDLLIMPEXP_CORE int wxGpiStrcmp(wxChar* s0, wxChar* s1);
WXDLLEXPORT void wxSliderEvent(WXHWND control, WXWORD wParam, WXWORD pos);
WXDLLEXPORT void wxScrollBarEvent(WXHWND hbar, WXWORD wParam, WXWORD pos);
WXDLLIMPEXP_CORE void wxSliderEvent(WXHWND control, WXWORD wParam, WXWORD pos);
WXDLLIMPEXP_CORE void wxScrollBarEvent(WXHWND hbar, WXWORD wParam, WXWORD pos);
// Find maximum size of window/rectangle
WXDLLEXPORT extern void wxFindMaxSize(WXHWND hwnd, RECT *rect);
WXDLLIMPEXP_CORE extern void wxFindMaxSize(WXHWND hwnd, RECT *rect);
WXDLLEXPORT wxWindow* wxFindControlFromHandle(WXHWND hWnd);
WXDLLEXPORT void wxAddControlHandle(WXHWND hWnd, wxWindow *item);
WXDLLIMPEXP_CORE wxWindow* wxFindControlFromHandle(WXHWND hWnd);
WXDLLIMPEXP_CORE void wxAddControlHandle(WXHWND hWnd, wxWindow *item);
// Safely get the window text (i.e. without using fixed size buffer)
WXDLLEXPORT extern wxString wxGetWindowText(WXHWND hWnd);
WXDLLIMPEXP_CORE extern wxString wxGetWindowText(WXHWND hWnd);
// get the window class name
WXDLLEXPORT extern wxString wxGetWindowClass(WXHWND hWnd);
WXDLLIMPEXP_CORE extern wxString wxGetWindowClass(WXHWND hWnd);
// get the window id (should be unsigned, hence this is not wxWindowID which
// is, for mainly historical reasons, signed)
WXDLLEXPORT extern WXWORD wxGetWindowId(WXHWND hWnd);
WXDLLIMPEXP_CORE extern WXWORD wxGetWindowId(WXHWND hWnd);
// Convert a PM Error code to a string
WXDLLIMPEXP_BASE extern wxString wxPMErrorToStr(ERRORID vError);
@@ -400,21 +400,21 @@ inline RECTL wxGetWindowRect(HWND hWnd)
return vRect;
} // end of wxGetWindowRect
WXDLLEXPORT extern void wxOS2SetFont( HWND hWnd
WXDLLIMPEXP_CORE extern void wxOS2SetFont( HWND hWnd
,const wxFont& rFont
);
WXDLLEXPORT extern bool wxCheckWindowWndProc( WXHWND hWnd
WXDLLIMPEXP_CORE extern bool wxCheckWindowWndProc( WXHWND hWnd
,WXFARPROC fnWndProc
);
WXDLLEXPORT extern wxBitmap wxDisableBitmap( const wxBitmap& rBmp
WXDLLIMPEXP_CORE extern wxBitmap wxDisableBitmap( const wxBitmap& rBmp
,long lColor
);
#if wxUSE_GUI
#include "wx/colour.h"
WXDLLEXPORT extern COLORREF wxColourToRGB(const wxColour& rColor);
WXDLLIMPEXP_CORE extern COLORREF wxColourToRGB(const wxColour& rColor);
#endif
#endif // __WXPM__

2
include/wx/os2/private/timer.h
View File

@@ -14,7 +14,7 @@
#include "wx/private/timer.h"
class WXDLLEXPORT wxOS2TimerImpl: public wxTimerImpl
class WXDLLIMPEXP_CORE wxOS2TimerImpl: public wxTimerImpl
{
friend void wxProcessTimer(wxOS2TimerImpl& timer);

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

@@ -15,7 +15,7 @@
// List box item
class WXDLLIMPEXP_FWD_CORE wxBitmap ;
class WXDLLEXPORT wxRadioBox: public wxControl, public wxRadioBoxBase
class WXDLLIMPEXP_CORE wxRadioBox: public wxControl, public wxRadioBoxBase
{
public:
wxRadioBox();

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

@@ -14,7 +14,7 @@
#include "wx/control.h"
class WXDLLEXPORT wxRadioButton: public wxControl
class WXDLLIMPEXP_CORE wxRadioButton: public wxControl
{
public:
inline wxRadioButton() { Init(); }

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

@@ -15,7 +15,7 @@
#include "wx/list.h"
#include "wx/os2/private.h"
class WXDLLEXPORT wxRegion : public wxRegionWithCombine
class WXDLLIMPEXP_CORE wxRegion : public wxRegionWithCombine
{
public:
wxRegion( wxCoord x
@@ -80,7 +80,7 @@ protected:
}; // end of CLASS wxRegion
class WXDLLEXPORT wxRegionIterator : public wxObject
class WXDLLIMPEXP_CORE wxRegionIterator : public wxObject
{
public:
wxRegionIterator();

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

@@ -15,7 +15,7 @@
#include "wx/scrolbar.h"
// Scrollbar item
class WXDLLEXPORT wxScrollBar : public wxScrollBarBase
class WXDLLIMPEXP_CORE wxScrollBar : public wxScrollBarBase
{
public:
inline wxScrollBar()

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

@@ -15,7 +15,7 @@
#include "wx/control.h"
// Slider
class WXDLLEXPORT wxSlider: public wxSliderBase
class WXDLLIMPEXP_CORE wxSlider: public wxSliderBase
{
public:
wxSlider();

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

@@ -22,7 +22,7 @@ extern MRESULT EXPENTRY wxSpinCtrlWndProc(
, MPARAM lParam
);
class WXDLLEXPORT wxSpinButton: public wxSpinButtonBase
class WXDLLIMPEXP_CORE wxSpinButton: public wxSpinButtonBase
{
public:
// Construction

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

@@ -23,7 +23,7 @@ WX_DEFINE_EXPORTED_ARRAY_PTR(wxSpinCtrl *, wxArraySpins);
// control is clicked.
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxSpinCtrl : public wxSpinButton
class WXDLLIMPEXP_CORE wxSpinCtrl : public wxSpinButton
{
public:
wxSpinCtrl() { }

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

@@ -15,7 +15,7 @@
#include "wx/control.h"
#include "wx/icon.h"
class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase
class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase
{
public:
inline wxStaticBitmap() { Init(); }

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

@@ -15,7 +15,7 @@
#include "wx/control.h"
// Group box
class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase
class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase
{
public:
inline wxStaticBox() {}

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

@@ -15,7 +15,7 @@
// wxStaticLine
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxStaticLine : public wxStaticLineBase
class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase
{
public:

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

@@ -14,7 +14,7 @@
#include "wx/control.h"
class WXDLLEXPORT wxStaticText : public wxStaticTextBase
class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase
{
public:
inline wxStaticText() { }

4
include/wx/os2/tabctrl.h
View File

@@ -23,7 +23,7 @@ class wxImageList;
#define wxTAB_HITTEST_ONLABEL 4
#define wxTAB_HITTEST_ONITEM 6
class WXDLLEXPORT wxTabCtrl: public wxControl
class WXDLLIMPEXP_CORE wxTabCtrl: public wxControl
{
DECLARE_DYNAMIC_CLASS(wxTabCtrl)
public:
@@ -118,7 +118,7 @@ protected:
DECLARE_EVENT_TABLE()
};
class WXDLLEXPORT wxTabEvent: public wxCommandEvent
class WXDLLIMPEXP_CORE wxTabEvent: public wxCommandEvent
{
DECLARE_DYNAMIC_CLASS(wxTabEvent)

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

@@ -14,7 +14,7 @@
typedef int (wxCALLBACK *wxTreeCtrlCompare)(long lItem1, long lItem2, long lSortData);
class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase
class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase
{
public:
wxTextCtrl();

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

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

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

@@ -19,7 +19,7 @@
#define ID_TOOLTIMER 100
#define ID_TOOLEXPTIMER 101
class WXDLLEXPORT wxToolBar: public wxToolBarBase
class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase
{
public:
/*

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

@@ -23,7 +23,7 @@ enum ETemplateID
// wxTopLevelWindowOS2
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxTopLevelWindowOS2 : public wxTopLevelWindowBase
class WXDLLIMPEXP_CORE wxTopLevelWindowOS2 : public wxTopLevelWindowBase
{
public:
// constructors and such

6
include/wx/os2/treectrl.h
View File

@@ -27,8 +27,8 @@
typedef long wxDataType;
// fwd decl
class WXDLLEXPORT wxImageList;
class WXDLLEXPORT wxDragImage;
class WXDLLIMPEXP_CORE wxImageList;
class WXDLLIMPEXP_CORE wxDragImage;
struct WXDLLIMPEXP_FWD_CORE wxTreeViewItem;
// a callback function used for sorting tree items, it should return -1 if the
@@ -48,7 +48,7 @@ WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP(wxTreeItemAttr *, wxMapTreeAttr);
// ----------------------------------------------------------------------------
// wxTreeCtrl
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxTreeCtrl : public wxControl
class WXDLLIMPEXP_CORE wxTreeCtrl : public wxControl
{
public:
// creation

6
include/wx/os2/window.h
View File

@@ -40,7 +40,7 @@ class WXDLLIMPEXP_FWD_CORE wxButton;
// wxWindow declaration for OS/2 PM
// ---------------------------------------------------------------------------
class WXDLLEXPORT wxWindowOS2 : public wxWindowBase
class WXDLLIMPEXP_CORE wxWindowOS2 : public wxWindowBase
{
public:
wxWindowOS2()
@@ -556,8 +556,8 @@ public:
// ---------------------------------------------------------------------------
// kbd code translation
WXDLLEXPORT int wxCharCodeOS2ToWX(int nKeySym);
WXDLLEXPORT int wxCharCodeWXToOS2( int nId
WXDLLIMPEXP_CORE int wxCharCodeOS2ToWX(int nKeySym);
WXDLLIMPEXP_CORE int wxCharCodeWXToOS2( int nId
,bool* pbIsVirtual = NULL
);