a better compilation fix

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

diff --git a/include/wx/collpane.h b/include/wx/collpane.h
index a52383bd6c74f340e992671c37b045f4705a15ec..ca8f6881bb80fe92a824d9c95cb67e099214f197 100644 (file)
--- a/include/wx/collpane.h
+++ b/include/wx/collpane.h
@@ -95,11 +95,10 @@ typedef void (wxEvtHandler::*wxCollapsiblePaneEventFunction)(wxCollapsiblePaneEv
 #else
     #include "wx/generic/collpaneg.h"
 
-    // use a typedef and not a #define to avoid problems with XRC forward declarations
-    typedef wxGenericCollapsiblePane wxCollapsiblePane;
+    // use #define and not a typedef to allow forward declaring the class
+    #define wxCollapsiblePane wxGenericCollapsiblePane
 #endif
 
-#endif      // wxUSE_COLLPANE
+#endif // wxUSE_COLLPANE
 
-#endif
-    // _WX_COLLAPSABLE_PANE_H_BASE_
+#endif // _WX_COLLAPSABLE_PANE_H_BASE_

diff --git a/include/wx/xrc/xh_collpane.h b/include/wx/xrc/xh_collpane.h
index b08b36821f009381032e3c6a3b1c9110e94802d2..2837ea3dfd082192f849ca28b93d0fdcfd668bcc 100644 (file)
--- a/include/wx/xrc/xh_collpane.h
+++ b/include/wx/xrc/xh_collpane.h
@@ -15,12 +15,10 @@
 
 #if wxUSE_XRC && wxUSE_COLLPANE
 
-#include "wx/collpane.h"
+class WXDLLIMPEXP_ADV wxCollapsiblePane;
 
 class WXDLLIMPEXP_XRC wxCollapsiblePaneXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxCollapsiblePaneXmlHandler)
-
 public:
     wxCollapsiblePaneXmlHandler();
     virtual wxObject *DoCreateResource();
@@ -29,6 +27,8 @@ public:
 private:
     bool m_isInside;
     wxCollapsiblePane *m_collpane;
+
+    DECLARE_DYNAMIC_CLASS(wxCollapsiblePaneXmlHandler)
 };
 
 #endif // wxUSE_XRC && wxUSE_COLLPANE

diff --git a/src/xrc/xh_collpane.cpp b/src/xrc/xh_collpane.cpp
index c8b489b3bcf46e85ffa82fc02b1cc9c5ffd39b85..7134ccd2ab2d786e0c02d28a95a58d0bac5c08d9 100644 (file)
--- a/src/xrc/xh_collpane.cpp
+++ b/src/xrc/xh_collpane.cpp
@@ -17,8 +17,12 @@
 
 #if wxUSE_XRC && wxUSE_COLLPANE
 
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif
+
+#include "wx/collpane.h"
 #include "wx/xrc/xh_collpane.h"
-#include "wx/log.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneXmlHandler, wxXmlResourceHandler)