Fix for wxTextCtrl::GetSelection for singel line controls in GTK2 mode

[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 4be4386cda376eb21d794722ed3efba702175b7c..98bbea58d440a0353c3bd87148dc1795b6b8b730 100644 (file)
--- a/contrib/include/wx/gizmos/splittree.h
+++ b/contrib/include/wx/gizmos/splittree.h
@@ -14,10 +14,12 @@
 #ifndef _WX_SPLITTREE_H_
 #define _WX_SPLITTREE_H_
 
 #ifndef _WX_SPLITTREE_H_
 #define _WX_SPLITTREE_H_
 

-#ifdef __GNUG__
-       #pragma interface "splittree.h"
+#if defined(__GNUG__) && !defined(__APPLE__)
+    #pragma interface "splittree.h"

 #endif
 
 #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
 


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

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

 {
 {

-       DECLARE_CLASS(wxRemotelyScrolledTreeCtrl)
+    DECLARE_CLASS(wxRemotelyScrolledTreeCtrl)

 public:
     wxRemotelyScrolledTreeCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pt = wxDefaultPosition,
         const wxSize& sz = wxDefaultSize, long style = wxTR_HAS_BUTTONS);
 public:
     wxRemotelyScrolledTreeCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pt = wxDefaultPosition,
         const wxSize& sz = wxDefaultSize, long style = wxTR_HAS_BUTTONS);

-       ~wxRemotelyScrolledTreeCtrl();
+    ~wxRemotelyScrolledTreeCtrl();

 
 //// Events
 
 //// Events

-       void OnSize(wxSizeEvent& event);
-       void OnExpand(wxTreeEvent& event);
+    void OnSize(wxSizeEvent& event);
+    void OnExpand(wxTreeEvent& event);

     void OnScroll(wxScrollWinEvent& event);
     void OnScroll(wxScrollWinEvent& event);

+    void OnPaint(wxPaintEvent& event);

 
 //// Overrides
     // Override this in case we're using the generic tree control.
 
 //// Overrides
     // Override this in case we're using the generic tree control.


@@ -82,18 +85,18 @@ public:
     virtual int GetScrollPos(int orient) const;
 
 //// Helpers
     virtual int GetScrollPos(int orient) const;
 
 //// Helpers

-       void HideVScrollbar();
+    void HideVScrollbar();

 
 

-       // Calculate the tree overall size so we can set the scrollbar
-       // correctly
-       void CalcTreeSize(wxRect& rect);
-       void CalcTreeSize(const wxTreeItemId& id, wxRect& rect);
+    // Calculate the tree overall size so we can set the scrollbar
+    // correctly
+    void CalcTreeSize(wxRect& rect);
+    void CalcTreeSize(const wxTreeItemId& id, wxRect& rect);

 
 

-       // Adjust the containing wxScrolledWindow's scrollbars appropriately
-       void AdjustRemoteScrollbars();
+    // Adjust the containing wxScrolledWindow's scrollbars appropriately
+    void AdjustRemoteScrollbars();

 
 

-       // Find the scrolled window that contains this control
-       wxScrolledWindow* GetScrolledWindow() const;
+    // Find the scrolled window that contains this control
+    wxScrolledWindow* GetScrolledWindow() const;

 
     // Scroll to the given line (in scroll units where each unit is
     // the height of an item)
 
     // Scroll to the given line (in scroll units where each unit is
     // the height of an item)


@@ -101,15 +104,16 @@ public:
 
 //// Accessors
 
 
 //// Accessors
 

-       // The companion window is one which will get notified when certain
-       // events happen such as node expansion
-       void SetCompanionWindow(wxWindow* companion) { m_companionWindow = companion; }
-       wxWindow* GetCompanionWindow() const { return m_companionWindow; }
+    // The companion window is one which will get notified when certain
+    // events happen such as node expansion
+    void SetCompanionWindow(wxWindow* companion) { m_companionWindow = companion; }
+    wxWindow* GetCompanionWindow() const { return m_companionWindow; }

 
 
     DECLARE_EVENT_TABLE()
 protected:
 
 
     DECLARE_EVENT_TABLE()
 protected:

-       wxWindow*       m_companionWindow;
+    wxWindow*   m_companionWindow;
+    bool        m_drawRowLines;

 };
 
 /*
 };
 
 /*


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

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

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


@@ -129,22 +133,22 @@ public:
       long style = 0);
 
 //// Overrides
       long style = 0);
 
 //// Overrides

-       virtual void DrawItem(wxDC& dc, wxTreeItemId id, const wxRect& rect);
+    virtual void DrawItem(wxDC& dc, wxTreeItemId id, const wxRect& rect);

 
 //// Events
 
 //// Events

-       void OnPaint(wxPaintEvent& event);    
+    void OnPaint(wxPaintEvent& event);

     void OnScroll(wxScrollWinEvent& event);
     void OnScroll(wxScrollWinEvent& event);

-       void OnExpand(wxTreeEvent& event);
+    void OnExpand(wxTreeEvent& event);

 
 //// Operations
 
 //// Accessors
 
 //// Operations
 
 //// Accessors

-       wxRemotelyScrolledTreeCtrl* GetTreeCtrl() const { return m_treeCtrl; };
-       void SetTreeCtrl(wxRemotelyScrolledTreeCtrl* treeCtrl) { m_treeCtrl = treeCtrl; }
+    wxRemotelyScrolledTreeCtrl* GetTreeCtrl() const { return m_treeCtrl; };
+    void SetTreeCtrl(wxRemotelyScrolledTreeCtrl* treeCtrl) { m_treeCtrl = treeCtrl; }

 
 //// Data members
 protected:
 
 //// Data members
 protected:

-       wxRemotelyScrolledTreeCtrl*     m_treeCtrl;
+    wxRemotelyScrolledTreeCtrl* m_treeCtrl;

 
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };


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

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

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


@@ -166,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
 


@@ -173,10 +178,10 @@ public:
     // Tests for x, y over sash. Overriding this allows us to increase
     // the tolerance.
     bool SashHitTest(int x, int y, int tolerance = 2);
     // Tests for x, y over sash. Overriding this allows us to increase
     // the tolerance.
     bool SashHitTest(int x, int y, int tolerance = 2);

-       void DrawSash(wxDC& dc);
+    void DrawSash(wxDC& dc);

 
 //// Events
 
 //// Events

-    
+

     void OnSize(wxSizeEvent& event);
 
 //// Operations
     void OnSize(wxSizeEvent& event);
 
 //// Operations


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

+    wxPen*      m_facePen;
+    wxBrush*    m_faceBrush;
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


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

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

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


@@ -210,7 +218,7 @@ public:
 //// Overrides
 
 //// Events
 //// Overrides
 
 //// Events

-    
+

     void OnScroll(wxScrollWinEvent& event);
     void OnSize(wxSizeEvent& event);
 
     void OnScroll(wxScrollWinEvent& event);
     void OnSize(wxSizeEvent& event);