From a5b3669d768c23e67f351b4a5cfd5a7de9810297 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 29 Jun 2001 16:51:05 +0000 Subject: [PATCH 1/1] define wxWindowNative for wxUniv compilation git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/window.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/include/wx/window.h b/include/wx/window.h index 93818581c6..f6d7b332c2 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -953,15 +953,19 @@ private: // include the declaration of the platform-specific class #if defined(__WXMSW__) - #if !defined(__WXUNIVERSAL__) + #ifdef __WXUNIVERSAL__ + #define wxWindowNative wxWindowMSW + #else // !wxUniv #define wxWindowMSW wxWindow #define sm_classwxWindowMSW sm_classwxWindow - #endif // wxUniv + #endif // wxUniv/!wxUniv #include "wx/msw/window.h" #elif defined(__WXMOTIF__) #include "wx/motif/window.h" #elif defined(__WXGTK__) - #if !defined(__WXUNIVERSAL__) + #ifdef __WXUNIVERSAL__ + #define wxWindowNative wxWindowGTK + #else // !wxUniv #define wxWindowGTK wxWindow #define sm_classwxWindowGTK sm_classwxWindow #endif // wxUniv @@ -977,6 +981,10 @@ private: // for wxUniversal, we now derive the real wxWindow from wxWindow, // for the native ports we already have defined it above #if defined(__WXUNIVERSAL__) + #ifndef wxWindowNative + #error "wxWindowNative must be defined above!" + #endif + #include "wx/univ/window.h" #endif // wxUniv -- 2.47.2