Added possibility of 2-step initialisation, and wxWIZARD_EX_HELPBUTTON style.

[wxWidgets.git] / include / wx / univ / window.h

diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h
index 4ecfa23d2d04acf42b6ed80e65fcf5ddf13fba08..baabd5350204d2a2d49511fa31b7322b1a5da258 100644 (file)
--- a/include/wx/univ/window.h
+++ b/include/wx/univ/window.h
@@ -15,7 +15,7 @@
 #define _WX_UNIV_WINDOW_H_
 
 #ifdef __GNUG__
 #define _WX_UNIV_WINDOW_H_
 
 #ifdef __GNUG__

-    #pragma interface "window.h"
+    #pragma interface "univwindow.h"

 #endif
 
 #include "wx/bitmap.h"      // for m_bitmapBg
 #endif
 
 #include "wx/bitmap.h"      // for m_bitmapBg


@@ -61,6 +61,8 @@ enum
 #define wxWindowNative wxWindowGTK
 #elif defined(__WXMGL__)
 #define wxWindowNative wxWindowMGL
 #define wxWindowNative wxWindowGTK
 #elif defined(__WXMGL__)
 #define wxWindowNative wxWindowMGL

+#elif defined(__WXMAC__)
+#define wxWindowNative wxWindowMac

 #endif
 
 class WXDLLEXPORT wxWindow : public wxWindowNative
 #endif
 
 class WXDLLEXPORT wxWindow : public wxWindowNative