Cleanup of previous fix

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

diff --git a/include/wx/minifram.h b/include/wx/minifram.h
index d340f57307666ef571342309e122979bfec6702f..3dfe5814299da50986f4afbe995ebbaf47dc4122 100644 (file)
--- a/include/wx/minifram.h
+++ b/include/wx/minifram.h
@@ -1,13 +1,43 @@
-#ifndef __MINIFRAMH_BASE__
-#define __MINIFRAMH_BASE_
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/minifram.h
+// Purpose:     wxMiniFrame base header
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// Copyright:   (c) Julian Smart
+// RCS-ID:      $Id$
+// Licence:     wxWindows Licence
+/////////////////////////////////////////////////////////////////////////////

 
 

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

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

-#elif defined(__MOTIF__)
-#include "wx/xt/minifram.h"
-#elif defined(__GTK__)
+#elif defined(__WXMOTIF__)
+#include "wx/motif/minifram.h"
+#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/osx/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
-    // __MINIFRAMH_BASE__
+#endif // wxUSE_MINIFRAME
+#endif // _WX_MINIFRAM_H_BASE_