From 065ae02d48d5a12459ddacafcecadaf088475e75 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Sun, 21 Oct 2007 18:07:29 +0000 Subject: [PATCH] add wxUSE_MINIFRAME wrapper git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/minifram.h | 6 ++++-- src/mac/carbon/minifram.cpp | 4 +++- src/motif/minifram.cpp | 4 +++- src/msw/minifram.cpp | 4 ++-- src/palmos/minifram.cpp | 4 ++-- src/x11/minifram.cpp | 6 +++++- 6 files changed, 19 insertions(+), 9 deletions(-) diff --git a/include/wx/minifram.h b/include/wx/minifram.h index 7453a7fe8e..6c8fd679f1 100644 --- a/include/wx/minifram.h +++ b/include/wx/minifram.h @@ -14,6 +14,8 @@ #include "wx/defs.h" +#if wxUSE_MINIFRAME + #if defined(__WXPALMOS__) #include "wx/palmos/minifram.h" #elif defined(__WXMSW__) @@ -37,5 +39,5 @@ 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 6ee18cf270..f7266d529e 100644 --- a/src/mac/carbon/minifram.cpp +++ b/src/mac/carbon/minifram.cpp @@ -11,8 +11,10 @@ #include "wx/wxprec.h" +#if wxUSE_MINIFRAME + #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 b2e1ad6746..b03bbc8762 100644 --- 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" +#if wxUSE_MINIFRAME + #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 0b73ceacec..ee9c1f95f9 100644 --- a/src/msw/minifram.cpp +++ b/src/msw/minifram.cpp @@ -16,10 +16,10 @@ #pragma hdrstop #endif -#ifndef WX_PRECOMP -#endif +#if wxUSE_MINIFRAME #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 014077885d..8a81f55cbd 100644 --- a/src/palmos/minifram.cpp +++ b/src/palmos/minifram.cpp @@ -16,10 +16,10 @@ #pragma hdrstop #endif -#ifndef WX_PRECOMP -#endif +#if wxUSE_MINIFRAME #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 d1aabac578..73c5310f87 100644 --- a/src/x11/minifram.cpp +++ b/src/x11/minifram.cpp @@ -9,8 +9,12 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +#include "wx/wxprec.h" + +#if wxUSE_MINIFRAME + #include "wx/minifram.h" IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame) - +#endif // wxUSE_MINIFRAME -- 2.45.2