Visualage C++ V4.0 duplicate symbol fixes

[wxWidgets.git] / src / generic / treectrl.cpp

diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp
index dfe22222913d6fb3e2baa32ab5478f3439f3a977..af2d4cf2e3e93b664d218e594e725c02824a4d4e 100644 (file)
--- a/src/generic/treectrl.cpp
+++ b/src/generic/treectrl.cpp
@@ -167,8 +167,8 @@ private:
                                           // children but has a [+] button
     int                 m_isBold      :1; // render the label in bold font
 
                                           // children but has a [+] button
     int                 m_isBold      :1; // render the label in bold font
 

-    int                 m_x, m_y;
-    long                m_height, m_width;
+    wxCoord             m_x, m_y;
+    wxCoord             m_height, m_width;

     int                 m_xCross, m_yCross;
     int                 m_level;
 
     int                 m_xCross, m_yCross;
     int                 m_level;
 


@@ -208,13 +208,18 @@ BEGIN_EVENT_TABLE(wxTreeTextCtrl,wxTextCtrl)
     EVT_KILL_FOCUS     (wxTreeTextCtrl::OnKillFocus)
 END_EVENT_TABLE()
 
     EVT_KILL_FOCUS     (wxTreeTextCtrl::OnKillFocus)
 END_EVENT_TABLE()
 

-wxTreeTextCtrl::wxTreeTextCtrl( wxWindow *parent, const wxWindowID id,
-    bool *accept, wxString *res, wxTreeCtrl *owner,
-    const wxString &value, const wxPoint &pos, const wxSize &size,
-#if wxUSE_VALIDATORS
-    int style, const wxValidator& validator, const wxString &name ) :
-#endif
-  wxTextCtrl( parent, id, value, pos, size, style, validator, name )
+wxTreeTextCtrl::wxTreeTextCtrl( wxWindow *parent,
+                                const wxWindowID id,
+                                bool *accept,
+                                wxString *res,
+                                wxTreeCtrl *owner,
+                                const wxString &value,
+                                const wxPoint &pos,
+                                const wxSize &size,
+                                int style,
+                                const wxValidator& validator,
+                                const wxString &name )
+              : wxTextCtrl( parent, id, value, pos, size, style, validator, name )

 {
     m_res = res;
     m_accept = accept;
 {
     m_res = res;
     m_accept = accept;


@@ -547,10 +552,8 @@ void wxTreeCtrl::Init()
 bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
                         const wxPoint& pos, const wxSize& size,
                         long style,
 bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
                         const wxPoint& pos, const wxSize& size,
                         long style,

-#if wxUSE_VALIDATORS
-            const wxValidator &validator,
-#endif
-            const wxString& name )
+                        const wxValidator &validator,
+                        const wxString& name )

 {
     Init();
 
 {
     Init();
 


@@ -589,14 +592,12 @@ void wxTreeCtrl::SetIndent(unsigned int indent)
 {
     m_indent = indent;
     m_dirty = TRUE;
 {
     m_indent = indent;
     m_dirty = TRUE;

-    Refresh();

 }
 
 void wxTreeCtrl::SetSpacing(unsigned int spacing)
 {
     m_spacing = spacing;
     m_dirty = TRUE;
 }
 
 void wxTreeCtrl::SetSpacing(unsigned int spacing)
 {
     m_spacing = spacing;
     m_dirty = TRUE;

-    Refresh();

 }
 
 size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item, bool recursively)
 }
 
 size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item, bool recursively)


@@ -2160,6 +2161,8 @@ void wxTreeCtrl::CalculatePositions()
 
 void wxTreeCtrl::RefreshSubtree(wxGenericTreeItem *item)
 {
 
 void wxTreeCtrl::RefreshSubtree(wxGenericTreeItem *item)
 {

+    if (m_dirty) return;
+

     wxClientDC dc(this);
     PrepareDC(dc);
 
     wxClientDC dc(this);
     PrepareDC(dc);
 


@@ -2180,6 +2183,8 @@ void wxTreeCtrl::RefreshSubtree(wxGenericTreeItem *item)
 
 void wxTreeCtrl::RefreshLine( wxGenericTreeItem *item )
 {
 
 void wxTreeCtrl::RefreshLine( wxGenericTreeItem *item )
 {

+    if (m_dirty) return;
+

     wxClientDC dc(this);
     PrepareDC( dc );
 
     wxClientDC dc(this);
     PrepareDC( dc );