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

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__