wxUSE_EXTENDED_RTTI as name

[wxWidgets.git] / contrib / include / wx / gizmos / splittree.h

diff --git a/contrib/include/wx/gizmos/splittree.h b/contrib/include/wx/gizmos/splittree.h
index 79ebb9c9a4e566e3cc262af11b7b6140f61a1a01..98bbea58d440a0353c3bd87148dc1795b6b8b730 100644 (file)
--- a/contrib/include/wx/gizmos/splittree.h
+++ b/contrib/include/wx/gizmos/splittree.h
@@ -18,11 +18,7 @@
     #pragma interface "splittree.h"
 #endif
 
     #pragma interface "splittree.h"
 #endif
 

-#ifdef GIZMOISDLL
-#define GIZMODLLEXPORT WXDLLEXPORT
-#else
-#define GIZMODLLEXPORT
-#endif
+#include "wx/gizmos/gizmos.h"

 
 // Set this to 1 to use generic tree control (doesn't yet work properly)
 #define USE_GENERIC_TREECTRL 0
 
 // Set this to 1 to use generic tree control (doesn't yet work properly)
 #define USE_GENERIC_TREECTRL 0


@@ -52,7 +48,7 @@ class wxSplitterScrolledWindow;
  * It also updates the scrolled window vertical scrollbar as appropriate.
  */
 
  * It also updates the scrolled window vertical scrollbar as appropriate.
  */
 

-class GIZMODLLEXPORT wxRemotelyScrolledTreeCtrl: public wxTreeCtrl
+class WXDLLIMPEXP_GIZMOS wxRemotelyScrolledTreeCtrl: public wxTreeCtrl

 {
     DECLARE_CLASS(wxRemotelyScrolledTreeCtrl)
 public:
 {
     DECLARE_CLASS(wxRemotelyScrolledTreeCtrl)
 public:


@@ -126,7 +122,7 @@ protected:
  * A window displaying values associated with tree control items.
  */
 
  * A window displaying values associated with tree control items.
  */
 

-class GIZMODLLEXPORT wxTreeCompanionWindow: public wxWindow
+class WXDLLIMPEXP_GIZMOS wxTreeCompanionWindow: public wxWindow

 {
 public:
     DECLARE_CLASS(wxTreeCompanionWindow)
 {
 public:
     DECLARE_CLASS(wxTreeCompanionWindow)


@@ -165,7 +161,7 @@ protected:
  * than the usual one.
  */
 
  * than the usual one.
  */
 

-class GIZMODLLEXPORT wxThinSplitterWindow: public wxSplitterWindow
+class WXDLLIMPEXP_GIZMOS wxThinSplitterWindow: public wxSplitterWindow

 {
 public:
     DECLARE_DYNAMIC_CLASS(wxThinSplitterWindow)
 {
 public:
     DECLARE_DYNAMIC_CLASS(wxThinSplitterWindow)


@@ -174,6 +170,7 @@ public:
       const wxPoint& pos = wxDefaultPosition,
       const wxSize& sz = wxDefaultSize,
       long style = wxSP_3D | wxCLIP_CHILDREN);
       const wxPoint& pos = wxDefaultPosition,
       const wxSize& sz = wxDefaultSize,
       long style = wxSP_3D | wxCLIP_CHILDREN);

+    ~wxThinSplitterWindow();

 
 //// Overrides
 
 
 //// Overrides
 


@@ -193,6 +190,9 @@ public:
 
 //// Data members
 protected:
 
 //// Data members
 protected:

+    wxPen*      m_facePen;
+    wxBrush*    m_faceBrush;
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -205,7 +205,7 @@ protected:
  * scroll appropriately.
  */
 
  * scroll appropriately.
  */
 

-class GIZMODLLEXPORT wxSplitterScrolledWindow: public wxScrolledWindow
+class WXDLLIMPEXP_GIZMOS wxSplitterScrolledWindow: public wxScrolledWindow

 {
 public:
     DECLARE_DYNAMIC_CLASS(wxSplitterScrolledWindow)
 {
 public:
     DECLARE_DYNAMIC_CLASS(wxSplitterScrolledWindow)