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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/os2/apptrait.h b/include/wx/os2/apptrait.h
index cfd7acce888b43927489382d7394b1e377b74c41..e17970337451de35172132cf8f19b276dac66788 100644 (file)
--- a/include/wx/os2/apptrait.h
+++ b/include/wx/os2/apptrait.h
@@ -19,9 +19,11 @@
 class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase
 {
 public:
+#if wxUSE_CONSOLE_EVENTLOOP
     virtual wxEventLoopBase *CreateEventLoop();
+#endif // wxUSE_CONSOLE_EVENTLOOP
 #if wxUSE_TIMER
-    virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) { return NULL; };
+    virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
 #endif
 };
 

diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h
index 6e8ffebd534c22530e59ed5a3b9add1e4b0709ad..685022f9f61972f03bf1d1d96ed06cf8498cd411 100644 (file)
--- a/include/wx/os2/private.h
+++ b/include/wx/os2/private.h
@@ -411,10 +411,11 @@ WXDLLEXPORT extern bool wxCheckWindowWndProc( WXHWND    hWnd
 WXDLLEXPORT extern wxBitmap wxDisableBitmap( const wxBitmap& rBmp
                                             ,long            lColor
                                            );
-
+#if wxUSE_GUI
 #include "wx/colour.h"
 
 WXDLLEXPORT extern COLORREF wxColourToRGB(const wxColour& rColor);
+#endif
 
 #endif // __WXPM__