Include wx/statbox.h according to precompiled headers of wx/wx.h (with other minor...

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

diff --git a/src/cocoa/statbox.mm b/src/cocoa/statbox.mm
index f60c482e30400994ec9186ea874641d80869e39a..bc36016905e55ab85f88574617d636230a7f2d37 100644 (file)
--- a/src/cocoa/statbox.mm
+++ b/src/cocoa/statbox.mm
@@ -1,18 +1,20 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/statbox.mm
+// Name:        src/cocoa/statbox.mm

 // Purpose:     wxStaticBox
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15
 // Purpose:     wxStaticBox
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) 2003 David Elliott
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWidgets licence
+// Licence:     wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+
+#include "wx/statbox.h"
+

 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"

-    #include "wx/statbox.h"

 #endif //WX_PRECOMP
 
 #include "wx/cocoa/autorelease.h"
 #endif //WX_PRECOMP
 
 #include "wx/cocoa/autorelease.h"


@@ -61,4 +63,3 @@ void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
     if(nextBorder > *borderOther)
         *borderOther = nextBorder;
 }
     if(nextBorder > *borderOther)
         *borderOther = nextBorder;
 }

-

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 92377a0d0ad6ff59e6c0c3dd21536f3aa98802ec..131977e2afd77697d56802802728b61e0e42409c 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -23,10 +23,10 @@
     #include "wx/math.h"
     #include "wx/utils.h"
     #include "wx/settings.h"
     #include "wx/math.h"
     #include "wx/utils.h"
     #include "wx/settings.h"

+    #include "wx/statbox.h"

 #endif // WX_PRECOMP
 
 #include "wx/sizer.h"
 #endif // WX_PRECOMP
 
 #include "wx/sizer.h"

-#include "wx/statbox.h"

 #include "wx/listimpl.cpp"
 
 #if WXWIN_COMPATIBILITY_2_4
 #include "wx/listimpl.cpp"
 
 #if WXWIN_COMPATIBILITY_2_4

diff --git a/src/generic/statline.cpp b/src/generic/statline.cpp
index fa1946572ff4ed21286885346f186e088ea322fe..023745015db8b4044064c3c0bd3245f07105d987 100644 (file)
--- a/src/generic/statline.cpp
+++ b/src/generic/statline.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        generic/statline.cpp
+// Name:        src/generic/statline.cpp

 // Purpose:     a generic wxStaticLine class
 // Author:      Vadim Zeitlin
 // Created:     28.06.99
 // Purpose:     a generic wxStaticLine class
 // Author:      Vadim Zeitlin
 // Created:     28.06.99


@@ -17,15 +17,20 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/wxprec.h"
 // ----------------------------------------------------------------------------
 
 #include "wx/wxprec.h"

-#if wxUSE_STATLINE
+

 // For compilers that support precompilation, includes "wx.h".
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 

+#if wxUSE_STATLINE
+

 #include "wx/statline.h"
 #include "wx/statline.h"

-#include "wx/statbox.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/statbox.h"
+#endif

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index 729cbcaf2cd4b71da06a0af91cd4abdca40ebab5..45ae9e51a6a78ab5e30f9c28bdaf622816a83082 100644 (file)
--- a/src/mac/carbon/control.cpp
+++ b/src/mac/carbon/control.cpp
@@ -22,13 +22,13 @@
     #include "wx/dialog.h"
     #include "wx/scrolbar.h"
     #include "wx/stattext.h"
     #include "wx/dialog.h"
     #include "wx/scrolbar.h"
     #include "wx/stattext.h"

+    #include "wx/statbox.h"

 #endif // WX_PRECOMP
 
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/radiobox.h"
 #include "wx/spinbutt.h"
 #endif // WX_PRECOMP
 
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/radiobox.h"
 #include "wx/spinbutt.h"

-#include "wx/statbox.h"

 #include "wx/sizer.h"
 
 #include "wx/mac/uma.h"
 #include "wx/sizer.h"
 
 #include "wx/mac/uma.h"

diff --git a/src/mac/carbon/statline.cpp b/src/mac/carbon/statline.cpp
index aa7c133387efbb63eb1e428ce779c915aa9dcaa8..62abfd106afd947fe72679132024c72ae50d2c3f 100644 (file)
--- a/src/mac/carbon/statline.cpp
+++ b/src/mac/carbon/statline.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        generic/statline.cpp
-// Purpose:     a generic wxStaticLine class
+// Name:        src/mac/carbon/statline.cpp
+// Purpose:     wxStaticLine class

 // Author:      Vadim Zeitlin
 // Created:     28.06.99
 // Version:     $Id$
 // Author:      Vadim Zeitlin
 // Created:     28.06.99
 // Version:     $Id$


@@ -15,7 +15,10 @@
 #endif
 
 #include "wx/statline.h"
 #endif
 
 #include "wx/statline.h"

-#include "wx/statbox.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/statbox.h"
+#endif

 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
 

diff --git a/src/mac/carbon/statlmac.cpp b/src/mac/carbon/statlmac.cpp
index 359893d527e5c1515f6d7e3df7e34377cc256660..d0102cc8c3b46ed4dc7d1dfdecfbaa3bb4755717 100644 (file)
--- a/src/mac/carbon/statlmac.cpp
+++ b/src/mac/carbon/statlmac.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        generic/statline.cpp
+// Name:        src/mac/carbon/statlmac.cpp

 // Purpose:     a generic wxStaticLine class
 // Author:      Vadim Zeitlin
 // Created:     28.06.99
 // Purpose:     a generic wxStaticLine class
 // Author:      Vadim Zeitlin
 // Created:     28.06.99


@@ -19,14 +19,17 @@
 // 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_STATLINE
-

 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 

+#if wxUSE_STATLINE
+

 #include "wx/statline.h"
 #include "wx/statline.h"

-#include "wx/statbox.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/statbox.h"
+#endif

 
 #include "wx/mac/uma.h"
 
 
 #include "wx/mac/uma.h"
 


@@ -47,19 +50,19 @@ bool wxStaticLine::Create( wxWindow *parent,
                            long style,
                            const wxString &name)
 {
                            long style,
                            const wxString &name)
 {

-    m_macIsUserPane = FALSE ;
-    
+    m_macIsUserPane = false ;
+

     if ( !wxStaticLineBase::Create(parent, id, pos, size,
                                    style, wxDefaultValidator, name) )
         return false;
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
     m_peer = new wxMacControl(this) ;
     if ( !wxStaticLineBase::Create(parent, id, pos, size,
                                    style, wxDefaultValidator, name) )
         return false;
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
     m_peer = new wxMacControl(this) ;

-    verify_noerr(CreateSeparatorControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, m_peer->GetControlRefAddr() ) ) ;  
+    verify_noerr(CreateSeparatorControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, m_peer->GetControlRefAddr() ) ) ;

 
     MacPostControlCreate(pos,size) ;
 
 
     MacPostControlCreate(pos,size) ;
 

-    return TRUE;
+    return true;

 }
 
 #endif //wxUSE_STATLINE
 }
 
 #endif //wxUSE_STATLINE

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 0623dc4a13e2ae00d611f34418b7dc95aad56eea..279b28d887c6b44ac679b5b36b25d9d3d0607b5c 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -27,10 +27,10 @@
     #include "wx/settings.h"
     #include "wx/msgdlg.h"
     #include "wx/scrolbar.h"
     #include "wx/settings.h"
     #include "wx/msgdlg.h"
     #include "wx/scrolbar.h"

+    #include "wx/statbox.h"

 #endif
 
 #include "wx/layout.h"
 #endif
 
 #include "wx/layout.h"

-#include "wx/statbox.h"

 #include "wx/tooltip.h"
 #include "wx/statusbr.h"
 #include "wx/menuitem.h"
 #include "wx/tooltip.h"
 #include "wx/statusbr.h"
 #include "wx/menuitem.h"

diff --git a/src/mac/classic/control.cpp b/src/mac/classic/control.cpp
index 0f1caf53aec07e207084c733396f877923bb278a..cebe8c8a135dd8e130cda85d452371235e435b34 100644 (file)
--- a/src/mac/classic/control.cpp
+++ b/src/mac/classic/control.cpp
@@ -26,13 +26,13 @@
     #include "wx/dialog.h"
     #include "wx/scrolbar.h"
     #include "wx/stattext.h"
     #include "wx/dialog.h"
     #include "wx/scrolbar.h"
     #include "wx/stattext.h"

+    #include "wx/statbox.h"

 #endif // WX_PRECOMP
 
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/radiobox.h"
 #include "wx/spinbutt.h"
 #endif // WX_PRECOMP
 
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/radiobox.h"
 #include "wx/spinbutt.h"

-#include "wx/statbox.h"

 #include "wx/sizer.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 #include "wx/sizer.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)

diff --git a/src/mac/classic/statline.cpp b/src/mac/classic/statline.cpp
index d8a182739783e6f886b53474c326f4f68cb2a8d8..cbc160d464dcb07cf9e15e3d14df1e00d3021a15 100644 (file)
--- a/src/mac/classic/statline.cpp
+++ b/src/mac/classic/statline.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        generic/statline.cpp
-// Purpose:     a generic wxStaticLine class
+// Name:        src/mac/classic/statline.cpp
+// Purpose:     wxStaticLine class

 // Author:      Vadim Zeitlin
 // Created:     28.06.99
 // Version:     $Id$
 // Author:      Vadim Zeitlin
 // Created:     28.06.99
 // Version:     $Id$


@@ -24,7 +24,10 @@
 #endif
 
 #include "wx/statline.h"
 #endif
 
 #include "wx/statline.h"

-#include "wx/statbox.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/statbox.h"
+#endif

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -44,7 +47,7 @@ bool wxStaticLine::Create( wxWindow *parent,
                            const wxString &name)
 {
     if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
                            const wxString &name)
 {
     if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )

-        return FALSE;
+        return false;

 
     // ok, this is ugly but it's better than nothing: use a thin static box to
     // emulate static line
 
     // ok, this is ugly but it's better than nothing: use a thin static box to
     // emulate static line


@@ -53,5 +56,5 @@ bool wxStaticLine::Create( wxWindow *parent,
 
 //    m_statbox = new wxStaticBox(parent, id, wxT(""), pos, sizeReal, style, name);
 
 
 //    m_statbox = new wxStaticBox(parent, id, wxT(""), pos, sizeReal, style, name);
 

-    return TRUE;
+    return true;

 }
 }

diff --git a/src/mac/classic/statlmac.cpp b/src/mac/classic/statlmac.cpp
index 0e54cd79757fba6c32b58150e96b1f8ae5ad0186..818321cb0dec0b3d08754af1f30478b1fc3a1f36 100644 (file)
--- a/src/mac/classic/statlmac.cpp
+++ b/src/mac/classic/statlmac.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        generic/statline.cpp
+// Name:        src/mac/classic/statlmac.cpp

 // Purpose:     a generic wxStaticLine class
 // Author:      Vadim Zeitlin
 // Created:     28.06.99
 // Purpose:     a generic wxStaticLine class
 // Author:      Vadim Zeitlin
 // Created:     28.06.99


@@ -24,7 +24,10 @@
 #endif
 
 #include "wx/statline.h"
 #endif
 
 #include "wx/statline.h"

-#include "wx/statbox.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/statbox.h"
+#endif

 
 #include "wx/mac/uma.h"
 
 
 #include "wx/mac/uma.h"
 


@@ -51,13 +54,13 @@ bool wxStaticLine::Create( wxWindow *parent,
 
     Rect bounds ;
     Str255 title ;
 
     Rect bounds ;
     Str255 title ;

-    
+

     MacPreControlCreate( parent , id ,  wxEmptyString , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
 
     MacPreControlCreate( parent , id ,  wxEmptyString , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
 

-    m_macControl = (WXWidget) ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
+    m_macControl = (WXWidget) ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1,

           kControlSeparatorLineProc , (long) this ) ;
           kControlSeparatorLineProc , (long) this ) ;

-    
+

     MacPostControlCreate() ;
 
     MacPostControlCreate() ;
 

-    return TRUE;
+    return true;

 }
 }

diff --git a/src/mac/classic/window.cpp b/src/mac/classic/window.cpp
index 3393452564881137c60374e341d66deaf55f17ba..0e5d2ca6727783f9a3a92f7c119d43f8d97e633e 100644 (file)
--- a/src/mac/classic/window.cpp
+++ b/src/mac/classic/window.cpp
@@ -27,11 +27,11 @@
     #include "wx/settings.h"
     #include "wx/msgdlg.h"
     #include "wx/scrolbar.h"
     #include "wx/settings.h"
     #include "wx/msgdlg.h"
     #include "wx/scrolbar.h"

+    #include "wx/statbox.h"

 #endif
 
 #include "wx/layout.h"
 #include "wx/listbox.h"
 #endif
 
 #include "wx/layout.h"
 #include "wx/listbox.h"

-#include "wx/statbox.h"

 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/tooltip.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/tooltip.h"

diff --git a/src/xrc/xh_sizer.cpp b/src/xrc/xh_sizer.cpp
index ca8f089f9175929e96ebfc26b0c02d21b0ff02b6..443c870ebb51ce0010fa411d8952664aaf898c2a 100644 (file)
--- a/src/xrc/xh_sizer.cpp
+++ b/src/xrc/xh_sizer.cpp
@@ -22,11 +22,11 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/panel.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/panel.h"

+    #include "wx/statbox.h"

 #endif
 
 #include "wx/sizer.h"
 #include "wx/gbsizer.h"
 #endif
 
 #include "wx/sizer.h"
 #include "wx/gbsizer.h"

-#include "wx/statbox.h"

 #include "wx/notebook.h"
 #include "wx/tokenzr.h"
 
 #include "wx/notebook.h"
 #include "wx/tokenzr.h"
 

diff --git a/src/xrc/xh_stbox.cpp b/src/xrc/xh_stbox.cpp
index 9c3c08a25f0704ddd7fe58c6283b7e044ca9a296..a52688d5e10d97c31524e44d7c1c9ed5066f9e43 100644 (file)
--- a/src/xrc/xh_stbox.cpp
+++ b/src/xrc/xh_stbox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_stbox.cpp
+// Name:        src/xrc/xh_stbox.cpp

 // Purpose:     XRC resource for wxStaticBox
 // Author:      Brian Gavin
 // Created:     2000/09/09
 // Purpose:     XRC resource for wxStaticBox
 // Author:      Brian Gavin
 // Created:     2000/09/09


@@ -15,15 +15,18 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_XRC
+#if wxUSE_XRC && wxUSE_STATBOX

 
 #include "wx/xrc/xh_stbox.h"
 
 #include "wx/xrc/xh_stbox.h"

-#include "wx/statbox.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/statbox.h"
+#endif

 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBoxXmlHandler, wxXmlResourceHandler)
 
 wxStaticBoxXmlHandler::wxStaticBoxXmlHandler()
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBoxXmlHandler, wxXmlResourceHandler)
 
 wxStaticBoxXmlHandler::wxStaticBoxXmlHandler()

-: wxXmlResourceHandler()
+                      :wxXmlResourceHandler()

 {
     AddWindowStyles();
 }
 {
     AddWindowStyles();
 }


@@ -49,4 +52,4 @@ bool wxStaticBoxXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxStaticBox"));
 }
 
     return IsOfClass(node, wxT("wxStaticBox"));
 }
 

-#endif // wxUSE_XRC
+#endif // wxUSE_XRC && wxUSE_STATBOX