Add wxDataViewRendererBase::GetEffectiveAlignment() and use it.

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

diff --git a/include/wx/minifram.h b/include/wx/minifram.h
index 9826eb274dc622ac80d9a13836064f7766a27437..f769c5a69111f9f19d0eeab8e23f3feb261eadf1 100644 (file)
--- a/include/wx/minifram.h
+++ b/include/wx/minifram.h
@@ -5,28 +5,36 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart

-// RCS-ID:      $Id$

 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MINIFRAM_H_BASE_
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 #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"

-#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__)
 #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_