Compile fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/include/wx/gizmos/splittree.h b/contrib/include/wx/gizmos/splittree.h
index 8165f3bbab2ae13cde2baf1c1c5339509de60618..98bbea58d440a0353c3bd87148dc1795b6b8b730 100644 (file)
--- a/contrib/include/wx/gizmos/splittree.h
+++ b/contrib/include/wx/gizmos/splittree.h
@@ -170,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
 


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

+    wxPen*      m_facePen;
+    wxBrush*    m_faceBrush;
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

diff --git a/contrib/src/gizmos/splittree.cpp b/contrib/src/gizmos/splittree.cpp
index 00f6902a03fee378f0687a9e58a2164b92aad0c5..1c9449bd8851700de305714cb67bec5ac3be844b 100644 (file)
--- a/contrib/src/gizmos/splittree.cpp
+++ b/contrib/src/gizmos/splittree.cpp
@@ -381,7 +381,7 @@ void wxRemotelyScrolledTreeCtrl::CalcTreeSize(const wxTreeItemId& id, wxRect& re
         rect = CombineRectangles(rect, itemSize);
     }
 
         rect = CombineRectangles(rect, itemSize);
     }
 

-    long cookie;
+    wxTreeItemIdValue cookie;

     wxTreeItemId childId = GetFirstChild(id, cookie);
     while (childId != 0)
     {
     wxTreeItemId childId = GetFirstChild(id, cookie);
     while (childId != 0)
     {


@@ -542,8 +542,18 @@ wxThinSplitterWindow::wxThinSplitterWindow(wxWindow* parent, wxWindowID id,
       long style):
       wxSplitterWindow(parent, id, pos, sz, style)
 {
       long style):
       wxSplitterWindow(parent, id, pos, sz, style)
 {

+    wxColour faceColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
+    m_facePen = new wxPen(faceColour, 1, wxSOLID);
+    m_faceBrush = new wxBrush(faceColour, wxSOLID);

 }
 
 }
 

+wxThinSplitterWindow::~wxThinSplitterWindow()
+{
+    delete m_facePen;
+    delete m_faceBrush;
+}
+
+

 void wxThinSplitterWindow::SizeWindows()
 {
     // The client size may have changed inbetween
 void wxThinSplitterWindow::SizeWindows()
 {
     // The client size may have changed inbetween


@@ -581,7 +591,7 @@ void wxThinSplitterWindow::DrawSash(wxDC& dc)
         {
             y1 = 2; h1 -= 3;
         }
         {
             y1 = 2; h1 -= 3;
         }

-        dc.DrawRectangle(m_sashPosition, y1, m_sashSize, h1);
+        dc.DrawRectangle(m_sashPosition, y1, GetSashSize(), h1);

     }
     else
     {
     }
     else
     {


@@ -595,7 +605,7 @@ void wxThinSplitterWindow::DrawSash(wxDC& dc)
         {
             x1 = 2; w1 -= 3;
         }
         {
             x1 = 2; w1 -= 3;
         }

-        dc.DrawRectangle(x1, m_sashPosition, w1, m_sashSize);
+        dc.DrawRectangle(x1, m_sashPosition, w1, GetSashSize());

     }
 
     dc.SetPen(wxNullPen);
     }
 
     dc.SetPen(wxNullPen);

diff --git a/contrib/src/gizmos/statpict.cpp b/contrib/src/gizmos/statpict.cpp
index 1f50fc8ce5ee6cd1c0980cd8e59f9c96bb828dc7..1886d3c54e93508a1f51eb0e370da559a6517b1a 100644 (file)
--- a/contrib/src/gizmos/statpict.cpp
+++ b/contrib/src/gizmos/statpict.cpp
@@ -13,6 +13,7 @@
   #pragma implementation "statpict.h"
 #endif
 
   #pragma implementation "statpict.h"
 #endif
 

+#include "wx/wxprec.h"

 #include "wx/defs.h"
 
 #include "wx/gizmos/statpict.h"
 #include "wx/defs.h"
 
 #include "wx/gizmos/statpict.h"