Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include wx/textctrl.h according to precompiled headers of wx/wx.h (with other minor cleaning).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-06-06 07:23:19 +00:00
parent 88f5a9ba6e
commit fec9cc08e7
32 changed files with 353 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
src/gtk1/treegtk.cpp
View File

@@ -19,10 +19,10 @@
#ifndef WX_PRECOMP
#include "wx/wx.h"
#include "wx/log.h"
#include "wx/textctrl.h"
#endif
#include "wx/gtk1/treectrl.h"
#include "wx/textctrl.h"
#include <gtk/gtk.h>
@@ -103,7 +103,7 @@ bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos,
if (y < 0)
y = 0;
m_needParent = TRUE;
m_needParent = true;
printf("precreate\n");
PreCreation( parent, id, pos, size, style, name );
@@ -133,7 +133,7 @@ printf("postcreate\n");
gtk_widget_realize(GTK_WIDGET(m_tree));
Show(TRUE);
Show(true);
return TRUE;
}
@@ -728,62 +728,68 @@ long wxTreeCtrl::GetChild(long item) const {
return (-1);
}
long wxTreeCtrl::GetFirstVisibleItem(void) const {
GtkTreeItem *next = NULL;
long wxTreeCtrl::GetFirstVisibleItem(void) const
{
GtkTreeItem *next = NULL;
GList *list = gtk_container_children(GTK_CONTAINER(m_anchor));
next = GTK_TREE_ITEM(list->data);
GList *list = gtk_container_children(GTK_CONTAINER(m_anchor));
next = GTK_TREE_ITEM(list->data);
// gtk_container_foreach(GTK_CONTAINER(m_anchor), gtk_treectrl_next_visible_callback, &next);
if (next != NULL)
return (long)gtk_object_get_data(GTK_OBJECT(next), "id");
if (next != NULL)
return (long)gtk_object_get_data(GTK_OBJECT(next), "id");
return (-1);
return wxNOT_FOUND;
}
long wxTreeCtrl::GetNextVisibleItem(long item) const {
GtkTreeItem *p;
GtkTreeItem *next = NULL;
long wxTreeCtrl::GetNextVisibleItem(long item) const
{
GtkTreeItem *p;
GtkTreeItem *next = NULL;
p = findGtkTreeItem(item);
GList *list = gtk_container_children(GTK_CONTAINER(p));
next = GTK_TREE_ITEM(list->data);
p = findGtkTreeItem(item);
GList *list = gtk_container_children(GTK_CONTAINER(p));
next = GTK_TREE_ITEM(list->data);
// gtk_container_foreach(GTK_CONTAINER(p), gtk_treectrl_next_visible_callback, &next);
if (next != NULL)
return (long)gtk_object_get_data(GTK_OBJECT(next), "id");
if (next != NULL)
return (long)gtk_object_get_data(GTK_OBJECT(next), "id");
return (-1);
return wxNOT_FOUND;
}
bool wxTreeCtrl::GetItem(wxTreeItem& info) const {
GtkTreeItem *p;
bool wxTreeCtrl::GetItem(wxTreeItem& info) const
{
GtkTreeItem *p;
p = findGtkTreeItem(info.m_itemId);
p = findGtkTreeItem(info.m_itemId);
if (p == NULL) {
wxLogSysError("TreeCtrl::GetItem failed");
return FALSE;
}
if (p == NULL)
{
wxLogSysError("TreeCtrl::GetItem failed");
return false;
}
wxConvertFromGtkTreeItem(info, p);
wxConvertFromGtkTreeItem(info, p);
return TRUE;
return true;
}
bool wxTreeCtrl::SetItem(wxTreeItem& info) {
GtkTreeItem *p;
bool wxTreeCtrl::SetItem(wxTreeItem& info)
{
GtkTreeItem *p;
p = findGtkTreeItem(info.m_itemId);
p = findGtkTreeItem(info.m_itemId);
if (p == NULL) {
wxLogSysError("TreeCtrl::SetItem failed");
return FALSE;
}
if (p == NULL)
{
wxLogSysError("TreeCtrl::SetItem failed");
return false;
}
wxConvertToGtkTreeItem(this, info, &p);
wxConvertToGtkTreeItem(this, info, &p);
return TRUE;
return true;
}
int wxTreeCtrl::GetItemState(long item, long stateMask) const {
@@ -813,16 +819,17 @@ bool wxTreeCtrl::SetItemState(long item, long state, long stateMask) {
// Operations
/*
bool wxTreeCtrl::DeleteChildren(long item) {
GtkTreeItem *p;
bool wxTreeCtrl::DeleteChildren(long item)
{
GtkTreeItem *p;
p = findGtkTreeItem(item);
if (p == NULL)
return FALSE;
p = findGtkTreeItem(item);
if (p == NULL)
return false;
gtk_tree_item_remove_subtree(GTK_TREE_ITEM(p));
gtk_tree_item_remove_subtree(GTK_TREE_ITEM(p));
return TRUE;
return true;
}
*/