projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reverted FILLCOLORHINT->FILLCOLOR change. Now when a near black themeColor is returne...
[wxWidgets.git]
/
src
/
gtk1
/
treegtk.cpp
diff --git
a/src/gtk1/treegtk.cpp
b/src/gtk1/treegtk.cpp
index 6d8fa194e161bc0d7feb275b0b1e99208529feeb..8c2dd7b4a408e494313354f6229a5018a309c5aa 100644
(file)
--- a/
src/gtk1/treegtk.cpp
+++ b/
src/gtk1/treegtk.cpp
@@
-9,7
+9,7
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "treectrl.h"
#endif
#pragma implementation "treectrl.h"
#endif
@@
-25,7
+25,7
@@
#endif
#include "wx/gtk/treectrl.h"
#endif
#include "wx/gtk/treectrl.h"
-#include
<wx/textctrl.h>
+#include
"wx/textctrl.h"
#include "wx/log.h"
#include <gtk/gtk.h>
#include "wx/log.h"
#include <gtk/gtk.h>
@@
-75,10
+75,8
@@
static void gtk_treeitem_select_callback(GtkWidget *widget, wxTreeItemId *treeit
owner->SendSelChanged(GTK_TREE_ITEM(widget));
}
owner->SendSelChanged(GTK_TREE_ITEM(widget));
}
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl)
-#endif
void wxTreeCtrl::Init() {
m_imageListNormal = NULL;
void wxTreeCtrl::Init() {
m_imageListNormal = NULL;
@@
-317,7
+315,7
@@
wxTreeItemId wxTreeCtrl::GetSelection() const {
return p;
}
return p;
}
-wxTreeItemId wxTreeCtrl::GetParent(const wxTreeItemId& item) const {
+wxTreeItemId wxTreeCtrl::Get
Item
Parent(const wxTreeItemId& item) const {
if (item.IsOk())
return (GtkTreeItem *)gtk_object_get_data(GTK_OBJECT((GtkTreeItem *)item), "parent");
if (item.IsOk())
return (GtkTreeItem *)gtk_object_get_data(GTK_OBJECT((GtkTreeItem *)item), "parent");