add wxUSE_MINIFRAME wrapper

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/minifram.h b/include/wx/minifram.h
index 7453a7fe8ea5216b54db17a666b54f838ebb0825..6c8fd679f1d28877ca080b0ad81a9a1ae80f1afb 100644 (file)
--- a/include/wx/minifram.h
+++ b/include/wx/minifram.h
@@ -14,6 +14,8 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

+#if wxUSE_MINIFRAME
+

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


@@ -37,5 +39,5 @@
 typedef wxFrame wxMiniFrame;
 #endif
 
 typedef wxFrame wxMiniFrame;
 #endif
 

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

diff --git a/src/mac/carbon/minifram.cpp b/src/mac/carbon/minifram.cpp
index 6ee18cf270fd50197d47f312537703108e624d73..f7266d529ee770aeb2a8cf4113e15da4c1f18ae7 100644 (file)
--- a/src/mac/carbon/minifram.cpp
+++ b/src/mac/carbon/minifram.cpp
@@ -11,8 +11,10 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

+#if wxUSE_MINIFRAME
+

 #include "wx/minifram.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
 
 #include "wx/minifram.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
 

-
+#endif // wxUSE_MINIFRAME

diff --git a/src/motif/minifram.cpp b/src/motif/minifram.cpp
index b2e1ad67460d3139d2f80c8df2adec7b9abed3c3..b03bbc876274c8a18d10ed276a039b4843e04172 100644 (file)
--- a/src/motif/minifram.cpp
+++ b/src/motif/minifram.cpp
@@ -12,8 +12,10 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_MINIFRAME
+

 #include "wx/minifram.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
 
 #include "wx/minifram.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
 

-
+#endif // wxUSE_MINIFRAME

diff --git a/src/msw/minifram.cpp b/src/msw/minifram.cpp
index 0b73ceacecfcb1f1a8c714aae6ef3b85467ff2b3..ee9c1f95f9c9f62d4cb0c06b55a30780db591193 100644 (file)
--- a/src/msw/minifram.cpp
+++ b/src/msw/minifram.cpp
@@ -16,10 +16,10 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-#endif
+#if wxUSE_MINIFRAME

 
 #include "wx/minifram.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
 
 
 #include "wx/minifram.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
 

+#endif // wxUSE_MINIFRAME

diff --git a/src/palmos/minifram.cpp b/src/palmos/minifram.cpp
index 014077885d2d8c2681541c2063f94af86cab0e5e..8a81f55cbd18e7553989275e9f80e3af7afe2e82 100644 (file)
--- a/src/palmos/minifram.cpp
+++ b/src/palmos/minifram.cpp
@@ -16,10 +16,10 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-#endif
+#if wxUSE_MINIFRAME

 
 #include "wx/minifram.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
 
 
 #include "wx/minifram.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
 

+#endif // wxUSE_MINIFRAME

diff --git a/src/x11/minifram.cpp b/src/x11/minifram.cpp
index d1aabac578d3d9fcb75d954df6e2da9a3d7b7f4a..73c5310f8799020d904f743f5a8123525066f9a5 100644 (file)
--- a/src/x11/minifram.cpp
+++ b/src/x11/minifram.cpp
@@ -9,8 +9,12 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+#include "wx/wxprec.h"
+
+#if wxUSE_MINIFRAME
+

 #include "wx/minifram.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
 
 #include "wx/minifram.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
 

-
+#endif // wxUSE_MINIFRAME