X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34424e1e7f118176d3b4d84193e6598d86ead73e..02b050202536727dc2bbb2fa1721ed44244fed97:/include/wx/collpane.h

diff --git a/include/wx/collpane.h b/include/wx/collpane.h
index a52383bd6c..3148f8ba7e 100644
--- a/include/wx/collpane.h
+++ b/include/wx/collpane.h
@@ -90,16 +90,15 @@ typedef void (wxEvtHandler::*wxCollapsiblePaneEventFunction)(wxCollapsiblePaneEv
     wx__DECLARE_EVT1(wxEVT_COMMAND_COLLPANE_CHANGED, id, wxCollapsiblePaneEventHandler(fn))
 
 
-#if defined(__WXGTK24__)
+#if defined(__WXGTK24__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/collpane.h"
 #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_