activating DrawRectangle optimization

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

diff --git a/include/wx/collpane.h b/include/wx/collpane.h
index 7a227db32c3260a6170dd7230b6502722c812d72..2d97a0b6b54ec1d1cfa37ec1e4bf5c807e7d64a7 100644 (file)
--- a/include/wx/collpane.h
+++ b/include/wx/collpane.h
@@ -19,15 +19,17 @@
 
 #include "wx/control.h"
 
+// class name
+extern WXDLLIMPEXP_DATA_CORE(const char) wxCollapsiblePaneNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxCollapsiblePaneBase: interface for wxCollapsiblePane
 // ----------------------------------------------------------------------------
 
-#define wxCP_DEFAULT_STYLE          (wxNO_BORDER)
+#define wxCP_DEFAULT_STYLE          (wxTAB_TRAVERSAL | wxNO_BORDER)
 #define wxCP_NO_TLW_RESIZE          (0x0002)
 
-class WXDLLIMPEXP_ADV wxCollapsiblePaneBase : public wxControl
+class WXDLLIMPEXP_CORE wxCollapsiblePaneBase : public wxControl
 {
 public:
     wxCollapsiblePaneBase() {}
@@ -49,11 +51,11 @@ public:
 // event types and macros
 // ----------------------------------------------------------------------------
 
-BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_COLLPANE_CHANGED, 1102)
-END_DECLARE_EVENT_TYPES()
+class WXDLLIMPEXP_FWD_CORE wxCollapsiblePaneEvent;
 
-class WXDLLIMPEXP_ADV wxCollapsiblePaneEvent : public wxCommandEvent
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_COLLPANE_CHANGED, wxCollapsiblePaneEvent );
+
+class WXDLLIMPEXP_CORE wxCollapsiblePaneEvent : public wxCommandEvent
 {
 public:
     wxCollapsiblePaneEvent() {}
@@ -84,22 +86,21 @@ private:
 typedef void (wxEvtHandler::*wxCollapsiblePaneEventFunction)(wxCollapsiblePaneEvent&);
 
 #define wxCollapsiblePaneEventHandler(func) \
-    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxCollapsiblePaneEventFunction, &func)
+    wxEVENT_HANDLER_CAST(wxCollapsiblePaneEventFunction, func)
 
 #define EVT_COLLAPSIBLEPANE_CHANGED(id, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_COLLPANE_CHANGED, id, wxCollapsiblePaneEventHandler(fn))
 
 
-#if defined(__WXGTK24__)
+#if defined(__WXGTK20__) && !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 wxCollapsiblePane wxGenericCollapsiblePane
+    // 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_