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

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

diff --git a/src/xrc/xh_split.cpp b/src/xrc/xh_split.cpp
index 4b23f9ff606e4affd70fa4bdac4fe08722d14174..f1dc8312461ab513580ddb88cf9abe5c9ac9fa41 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


@@ -7,10 +7,6 @@
 // Copyright:   (c) 2003 panga@freemail.hu, Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2003 panga@freemail.hu, Vaclav Slavik
 // 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,20 +15,31 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC
+

 #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)

 
 wxSplitterWindowXmlHandler::wxSplitterWindowXmlHandler() : wxXmlResourceHandler()
 {
     XRC_ADD_STYLE(wxSP_3D);
     XRC_ADD_STYLE(wxSP_3DSASH);
     XRC_ADD_STYLE(wxSP_3DBORDER);
 
 wxSplitterWindowXmlHandler::wxSplitterWindowXmlHandler() : wxXmlResourceHandler()
 {
     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_LIVE_UPDATE);
     XRC_ADD_STYLE(wxSP_BORDER);
     XRC_ADD_STYLE(wxSP_NOBORDER);
     XRC_ADD_STYLE(wxSP_PERMIT_UNSPLIT);
     XRC_ADD_STYLE(wxSP_LIVE_UPDATE);

+    XRC_ADD_STYLE(wxSP_NO_XP_THEME);

     AddWindowStyles();
 }
 
     AddWindowStyles();
 }
 


@@ -57,7 +64,7 @@ wxObject *wxSplitterWindowXmlHandler::DoCreateResource()
     wxXmlNode *n = m_node->GetChildren();
     while (n)
     {
     wxXmlNode *n = m_node->GetChildren();
     while (n)
     {

-        if ((n->GetType() == wxXML_ELEMENT_NODE) && 
+        if ((n->GetType() == wxXML_ELEMENT_NODE) &&

             (n->GetName() == wxT("object") ||
              n->GetName() == wxT("object_ref")))
         {
             (n->GetName() == wxT("object") ||
              n->GetName() == wxT("object_ref")))
         {


@@ -71,7 +78,7 @@ wxObject *wxSplitterWindowXmlHandler::DoCreateResource()
             {
                 win2 = win;
                 break;
             {
                 win2 = win;
                 break;

-            }            
+            }

         }
         n = n->GetNext();
     }
         }
         n = n->GetNext();
     }


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

-
+#endif // wxUSE_XRC