removing outdated code

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

diff --git a/include/wx/minifram.h b/include/wx/minifram.h
index 915781b2c2d71aff754f1f33147e75c264eb2f6c..16f427589318f45683d075dd09418118fa7fa315 100644 (file)
--- a/include/wx/minifram.h
+++ b/include/wx/minifram.h
@@ -10,11 +10,13 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MINIFRAM_H_BASE_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MINIFRAM_H_BASE_

-#define _WX_MINIFRAMH_BASE_
+#define _WX_MINIFRAM_H_BASE_

 
 

-#if defined(__WXPALMOS__)
-#include "wx/palmos/minifram.h"
-#elif defined(__WXMSW__)
+#include "wx/defs.h"
+
+#if wxUSE_MINIFRAME
+
+#if defined(__WXMSW__)

 #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"


@@ -25,10 +27,15 @@
 #elif defined(__WXX11__)
 #include "wx/x11/minifram.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXX11__)
 #include "wx/x11/minifram.h"
 #elif defined(__WXMAC__)

-#include "wx/mac/minifram.h"
+#include "wx/osx/minifram.h"

 #elif defined(__WXPM__)
 #include "wx/os2/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_