more VC6 fixes: nested value must be real classes, not typedefs; skeleton declaration...

[wxWidgets.git] / include / wx / minifram.h

diff --git a/include/wx/minifram.h b/include/wx/minifram.h
index 9826eb274dc622ac80d9a13836064f7766a27437..6c8fd679f1d28877ca080b0ad81a9a1ae80f1afb 100644 (file)
--- a/include/wx/minifram.h
+++ b/include/wx/minifram.h
@@ -10,7 +10,11 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MINIFRAM_H_BASE_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MINIFRAM_H_BASE_

-#define _WX_MINIFRAMH_BASE_
+#define _WX_MINIFRAM_H_BASE_
+
+#include "wx/defs.h"
+
+#if wxUSE_MINIFRAME

 
 #if defined(__WXPALMOS__)
 #include "wx/palmos/minifram.h"
 
 #if defined(__WXPALMOS__)
 #include "wx/palmos/minifram.h"


@@ -18,15 +22,22 @@
 #include "wx/msw/minifram.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/minifram.h"
 #include "wx/msw/minifram.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/minifram.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

 #include "wx/gtk/minifram.h"
 #include "wx/gtk/minifram.h"

+#elif defined(__WXGTK__)
+#include "wx/gtk1/minifram.h"

 #elif defined(__WXX11__)
 #include "wx/x11/minifram.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/minifram.h"
 #elif defined(__WXPM__)
 #include "wx/os2/minifram.h"
 #elif defined(__WXX11__)
 #include "wx/x11/minifram.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/minifram.h"
 #elif defined(__WXPM__)
 #include "wx/os2/minifram.h"

+#else
+// TODO: it seems that wxMiniFrame could be just defined here generically
+//       instead of having all the above port-specific headers
+#include "wx/frame.h"
+typedef wxFrame wxMiniFrame;

 #endif
 
 #endif
 

-#endif
-    // _WX_MINIFRAM_H_BASE_
+#endif // wxUSE_MINIFRAME
+#endif // _WX_MINIFRAM_H_BASE_