check for wxUSE_MDI which is needed by this code (patch 1656080)

[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..c6cd5896ad44b37a742bc7d6ea27e489877c9590 100644 (file)
--- a/contrib/include/wx/gizmos/splittree.h
+++ b/contrib/include/wx/gizmos/splittree.h
@@ -14,15 +14,7 @@
 #ifndef _WX_SPLITTREE_H_
 #define _WX_SPLITTREE_H_
 
 #ifndef _WX_SPLITTREE_H_
 #define _WX_SPLITTREE_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-    #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 +44,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:


@@ -76,7 +68,7 @@ public:
     virtual void SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
                              int noUnitsX, int noUnitsY,
                              int xPos = 0, int yPos = 0,
     virtual void SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
                              int noUnitsX, int noUnitsY,
                              int xPos = 0, int yPos = 0,

-                             bool noRefresh = FALSE );
+                             bool noRefresh = false );

 
     // In case we're using the generic tree control.
     // Get the view start
 
     // In case we're using the generic tree control.
     // Get the view start


@@ -126,12 +118,12 @@ 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)
 

-    wxTreeCompanionWindow(wxWindow* parent, wxWindowID id = -1,
+    wxTreeCompanionWindow(wxWindow* parent, wxWindowID id = wxID_ANY,

       const wxPoint& pos = wxDefaultPosition,
       const wxSize& sz = wxDefaultSize,
       long style = 0);
       const wxPoint& pos = wxDefaultPosition,
       const wxSize& sz = wxDefaultSize,
       long style = 0);


@@ -165,15 +157,16 @@ 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)
 

-    wxThinSplitterWindow(wxWindow* parent, wxWindowID id = -1,
+    wxThinSplitterWindow(wxWindow* parent, wxWindowID id = wxID_ANY,

       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 +186,9 @@ public:
 
 //// Data members
 protected:
 
 //// Data members
 protected:

+    wxPen*      m_facePen;
+    wxBrush*    m_faceBrush;
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -205,12 +201,12 @@ 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)
 

-    wxSplitterScrolledWindow(wxWindow* parent, wxWindowID id = -1,
+    wxSplitterScrolledWindow(wxWindow* parent, wxWindowID id = wxID_ANY,

       const wxPoint& pos = wxDefaultPosition,
       const wxSize& sz = wxDefaultSize,
       long style = 0);
       const wxPoint& pos = wxDefaultPosition,
       const wxSize& sz = wxDefaultSize,
       long style = 0);