check that the version of __sync_sub_and_fetch that returns a value is supported...

[wxWidgets.git] / src / xrc / xh_split.cpp

diff --git a/src/xrc/xh_split.cpp b/src/xrc/xh_split.cpp
index d9b2597896e788dab66597dca8a00e3e90115238..fd219118089c2eb66f37ec5e7bd899e62910b6d7 100644 (file)
--- a/src/xrc/xh_split.cpp
+++ b/src/xrc/xh_split.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     XRC resource for wxSplitterWindow
 // Author:      panga@freemail.hu, Vaclav Slavik
 // Created:     2003/01/26
 // Purpose:     XRC resource for wxSplitterWindow
 // Author:      panga@freemail.hu, Vaclav Slavik
 // Created:     2003/01/26


@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "xh_split.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -19,11 +15,15 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC && wxUSE_SPLITTER

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

+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif
+

 #include "wx/splitter.h"
 #include "wx/splitter.h"

-#include "wx/log.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindowXmlHandler, wxXmlResourceHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindowXmlHandler, wxXmlResourceHandler)
 


@@ -32,7 +32,9 @@ wxSplitterWindowXmlHandler::wxSplitterWindowXmlHandler() : wxXmlResourceHandler(
     XRC_ADD_STYLE(wxSP_3D);
     XRC_ADD_STYLE(wxSP_3DSASH);
     XRC_ADD_STYLE(wxSP_3DBORDER);
     XRC_ADD_STYLE(wxSP_3D);
     XRC_ADD_STYLE(wxSP_3DSASH);
     XRC_ADD_STYLE(wxSP_3DBORDER);

+#if WXWIN_COMPATIBILITY_2_6

     XRC_ADD_STYLE(wxSP_FULLSASH);
     XRC_ADD_STYLE(wxSP_FULLSASH);

+#endif // WXWIN_COMPATIBILITY_2_6

     XRC_ADD_STYLE(wxSP_BORDER);
     XRC_ADD_STYLE(wxSP_NOBORDER);
     XRC_ADD_STYLE(wxSP_PERMIT_UNSPLIT);
     XRC_ADD_STYLE(wxSP_BORDER);
     XRC_ADD_STYLE(wxSP_NOBORDER);
     XRC_ADD_STYLE(wxSP_PERMIT_UNSPLIT);


@@ -55,8 +57,11 @@ wxObject *wxSplitterWindowXmlHandler::DoCreateResource()
 
     long sashpos = GetLong(wxT("sashpos"), 0);
     long minpanesize = GetLong(wxT("minsize"), -1);
 
     long sashpos = GetLong(wxT("sashpos"), 0);
     long minpanesize = GetLong(wxT("minsize"), -1);

+    float gravity = GetFloat(wxT("gravity"), 0.0);

     if (minpanesize != -1)
     if (minpanesize != -1)

-         splitter->SetMinimumPaneSize(minpanesize);
+        splitter->SetMinimumPaneSize(minpanesize);
+    if (gravity != 0.0)
+        splitter->SetSashGravity(gravity);

 
     wxWindow *win1 = NULL, *win2 = NULL;
     wxXmlNode *n = m_node->GetChildren();
 
     wxWindow *win1 = NULL, *win2 = NULL;
     wxXmlNode *n = m_node->GetChildren();


@@ -105,4 +110,4 @@ bool wxSplitterWindowXmlHandler::CanHandle(wxXmlNode *node)
      return IsOfClass(node, wxT("wxSplitterWindow"));
 }
 
      return IsOfClass(node, wxT("wxSplitterWindow"));
 }
 

-#endif // wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC && wxUSE_SPLITTER