fixed compilation if wxUSE_STL=1

[wxWidgets.git] / include / wx / collpane.h

diff --git a/include/wx/collpane.h b/include/wx/collpane.h
index 7bea0b14ab6156fbc2b3336553ceb52dc9ab27a0..8ff545d3bcda9be57ee2dc287c3f461ea7f2782c 100644 (file)
--- a/include/wx/collpane.h
+++ b/include/wx/collpane.h
@@ -12,6 +12,11 @@
 #ifndef _WX_COLLAPSABLE_PANE_H_BASE_
 #define _WX_COLLAPSABLE_PANE_H_BASE_
 
 #ifndef _WX_COLLAPSABLE_PANE_H_BASE_
 #define _WX_COLLAPSABLE_PANE_H_BASE_
 

+#include "wx/defs.h"
+
+
+#if wxUSE_COLLPANE
+

 #include "wx/control.h"
 
 
 #include "wx/control.h"
 
 


@@ -19,9 +24,10 @@
 // wxCollapsiblePaneBase: interface for wxCollapsiblePane
 // ----------------------------------------------------------------------------
 
 // wxCollapsiblePaneBase: interface for wxCollapsiblePane
 // ----------------------------------------------------------------------------
 

-#define wxCP_DEFAULT_STYLE          (0)
+#define wxCP_DEFAULT_STYLE          (wxTAB_TRAVERSAL | wxNO_BORDER)
+#define wxCP_NO_TLW_RESIZE          (0x0002)

 
 

-class WXDLLEXPORT wxCollapsiblePaneBase : public wxControl
+class WXDLLIMPEXP_CORE wxCollapsiblePaneBase : public wxControl

 {
 public:
     wxCollapsiblePaneBase() {}
 {
 public:
     wxCollapsiblePaneBase() {}


@@ -81,15 +87,18 @@ typedef void (wxEvtHandler::*wxCollapsiblePaneEventFunction)(wxCollapsiblePaneEv
     (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxCollapsiblePaneEventFunction, &func)
 
 #define EVT_COLLAPSIBLEPANE_CHANGED(id, fn) \
     (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxCollapsiblePaneEventFunction, &func)
 
 #define EVT_COLLAPSIBLEPANE_CHANGED(id, fn) \

-    wx__DECLARE_EVT1(wxEVT_COMMAND_COLLPANE_CHANGED, id, wxCollapsiblePaneEventFunction(fn))
+    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"
     #include "wx/gtk/collpane.h"
 #else
     #include "wx/generic/collpaneg.h"

-    #define wxCollapsiblePane   wxGenericCollapsiblePane
-#endif

 
 

+    // use #define and not a typedef to allow forward declaring the class
+    #define wxCollapsiblePane wxGenericCollapsiblePane

 #endif
 #endif

-    // _WX_COLLAPSABLE_PANE_H_BASE_
+
+#endif // wxUSE_COLLPANE
+
+#endif // _WX_COLLAPSABLE_PANE_H_BASE_