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

Compilation fix (CreateTimerImpl is taken from timerunx.cpp, so not inline).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2008-03-23 14:41:14 +00:00
parent e71fa8fa2f
commit 5c80fea840
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,9 +19,11 @@
class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase
{ {
public: public:
#if wxUSE_CONSOLE_EVENTLOOP
virtual wxEventLoopBase *CreateEventLoop(); virtual wxEventLoopBase *CreateEventLoop();
#endif // wxUSE_CONSOLE_EVENTLOOP
#if wxUSE_TIMER #if wxUSE_TIMER
virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) { return NULL; }; virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
#endif #endif
}; };

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

@@ -411,10 +411,11 @@ WXDLLEXPORT extern bool wxCheckWindowWndProc( WXHWND hWnd
WXDLLEXPORT extern wxBitmap wxDisableBitmap( const wxBitmap& rBmp WXDLLEXPORT extern wxBitmap wxDisableBitmap( const wxBitmap& rBmp
,long lColor ,long lColor
); );
#if wxUSE_GUI
#include "wx/colour.h" #include "wx/colour.h"
WXDLLEXPORT extern COLORREF wxColourToRGB(const wxColour& rColor); WXDLLEXPORT extern COLORREF wxColourToRGB(const wxColour& rColor);
#endif
#endif // __WXPM__ #endif // __WXPM__