fix for assert when setting tooltip for a readonly combo

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

diff --git a/src/stubs/treectrl.cpp b/src/stubs/treectrl.cpp
index 0b405a7106296bfdaa960dfe8510148a261739c7..3aea32e970e95e791b783448a9c81f198ab64193 100644 (file)
--- a/src/stubs/treectrl.cpp
+++ b/src/stubs/treectrl.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        treectrl.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        treectrl.cpp

-// Purpose:     wxTreeCtrl
+// Purpose:     wxTreeCtrl. See also Robert's generic wxTreeCtrl.

 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98
 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98


@@ -13,13 +13,12 @@
 #pragma implementation "treectrl.h"
 #endif
 
 #pragma implementation "treectrl.h"
 #endif
 

-#include "wx/treectrl.h"
+#include "wx/stubs/textctrl.h"
+#include "wx/stubs/treectrl.h"

 
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxTreeItem, wxObject)
 
 IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxTreeItem, wxObject)
 

-#endif

 
 wxTreeCtrl::wxTreeCtrl()
 {
 
 wxTreeCtrl::wxTreeCtrl()
 {


@@ -251,7 +250,7 @@ bool wxTreeCtrl::SetItemData(long item, long data)
     return SetItem(info);
 }
 
     return SetItem(info);
 }
 

-bool wxTreeCtrl::GetItemRect(long item, wxRectangle& rect, bool textOnly) const
+bool wxTreeCtrl::GetItemRect(long item, wxRect& rect, bool textOnly) const

 {
     // TODO
     return FALSE;
 {
     // TODO
     return FALSE;


@@ -281,11 +280,9 @@ bool wxTreeCtrl::ExpandItem(long item, int action)
       break;
 
     case wxTREE_EXPAND_COLLAPSE_RESET:
       break;
 
     case wxTREE_EXPAND_COLLAPSE_RESET:

-      mswAction = TVE_COLLAPSERESET;

       break;
 
     case wxTREE_EXPAND_TOGGLE:
       break;
 
     case wxTREE_EXPAND_TOGGLE:

-      mswAction = TVE_TOGGLE;

       break;
 
     default:
       break;
 
     default: