fixing warning and compile error against 10.4

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

diff --git a/include/wx/minifram.h b/include/wx/minifram.h
index 3c06de8766f458d883cee57a214869f23c0792bc..3dfe5814299da50986f4afbe995ebbaf47dc4122 100644 (file)
--- a/include/wx/minifram.h
+++ b/include/wx/minifram.h
@@ -10,10 +10,12 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #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"
 #elif defined(__WXMSW__)
@@ -27,7 +29,7 @@
 #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"
 #else
@@ -37,5 +39,5 @@
 typedef wxFrame wxMiniFrame;
 #endif
 
-#endif
-    // _WX_MINIFRAM_H_BASE_
+#endif // wxUSE_MINIFRAME
+#endif // _WX_MINIFRAM_H_BASE_