From b46e869676813430c8fbf0d5828005f1b898d985 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sun, 13 Dec 1998 09:14:35 +0000 Subject: [PATCH] Added wxList:Nth check again Added checks to wxImageList Made toolbar tips yellow Removed options from wx-config Added bitmaps to DialogEd tree ctrl git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/tbargtk.h | 4 +- include/wx/gtk1/tbargtk.h | 4 +- samples/treectrl/treetest.h | 2 +- src/common/list.cpp | 2 +- src/generic/imaglist.cpp | 101 +++++++++++++++++--------------- src/gtk/tbargtk.cpp | 12 ++++ src/gtk1/tbargtk.cpp | 12 ++++ utils/dialoged/src/reseditr.cpp | 12 +++- wx-config.in | 2 +- 9 files changed, 98 insertions(+), 53 deletions(-) diff --git a/include/wx/gtk/tbargtk.h b/include/wx/gtk/tbargtk.h index ac40522343..dc4320d428 100644 --- a/include/wx/gtk/tbargtk.h +++ b/include/wx/gtk/tbargtk.h @@ -127,10 +127,12 @@ class wxToolBar: public wxControl virtual void SetToolPacking(int packing); virtual void SetToolSeparation(int separation); - public: + // implementation GtkToolbar *m_toolbar; wxList m_tools; + GdkColor m_fg; + GdkColor m_bg; }; #endif diff --git a/include/wx/gtk1/tbargtk.h b/include/wx/gtk1/tbargtk.h index ac40522343..dc4320d428 100644 --- a/include/wx/gtk1/tbargtk.h +++ b/include/wx/gtk1/tbargtk.h @@ -127,10 +127,12 @@ class wxToolBar: public wxControl virtual void SetToolPacking(int packing); virtual void SetToolSeparation(int separation); - public: + // implementation GtkToolbar *m_toolbar; wxList m_tools; + GdkColor m_fg; + GdkColor m_bg; }; #endif diff --git a/samples/treectrl/treetest.h b/samples/treectrl/treetest.h index fd921e2f64..9adacc8acf 100644 --- a/samples/treectrl/treetest.h +++ b/samples/treectrl/treetest.h @@ -54,7 +54,7 @@ public: void OnItemCollapsing(wxTreeEvent& event); void OnSelChanged(wxTreeEvent& event); void OnSelChanging(wxTreeEvent& event); - void OnTreeKeyDown(wxKeyEvent& event); + void OnTreeKeyDown(wxTreeEvent& event); void GetItemsRecursively(const wxTreeItemId& idParent, long cookie); diff --git a/src/common/list.cpp b/src/common/list.cpp index c6e0ebccb9..b11a21e816 100644 --- a/src/common/list.cpp +++ b/src/common/list.cpp @@ -292,7 +292,7 @@ wxNodeBase *wxListBase::Item(size_t n) const } } -// wxFAIL_MSG( "invalid index in wxListBase::Item" ); + wxFAIL_MSG( "invalid index in wxListBase::Item" ); return (wxNodeBase *)NULL; } diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp index ad91a211e0..29ad9cdb75 100644 --- a/src/generic/imaglist.cpp +++ b/src/generic/imaglist.cpp @@ -21,9 +21,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject) wxImageList::wxImageList( int width, int height, bool WXUNUSED(mask), int WXUNUSED(initialCount) ) { - m_width = width; - m_height = height; - Create(); + m_width = width; + m_height = height; + Create(); } wxImageList::~wxImageList() @@ -32,90 +32,97 @@ wxImageList::~wxImageList() int wxImageList::GetImageCount() const { - return m_images.Number(); + return m_images.Number(); } bool wxImageList::Create() { - m_images.DeleteContents( TRUE ); - return TRUE; + m_images.DeleteContents( TRUE ); + return TRUE; } int wxImageList::Add( const wxBitmap &bitmap ) { - m_images.Append( new wxBitmap(bitmap) ); - return m_images.Number(); + m_images.Append( new wxBitmap(bitmap) ); + return m_images.Number(); } -const wxBitmap *wxImageList::GetBitmap(int index) const { - wxNode *node = m_images.Nth(index); - if (node != NULL) +const wxBitmap *wxImageList::GetBitmap( int index ) const +{ + wxNode *node = m_images.Nth( index ); + + wxCHECK_MSG( node, (wxBitmap *) NULL, "wrong index in image list" ); + return (wxBitmap*)node->Data(); - - return (wxBitmap *) NULL; } bool wxImageList::Replace( int index, const wxBitmap &bitmap ) { - wxNode *node = m_images.Nth( index ); - if (!node) return FALSE; + wxNode *node = m_images.Nth( index ); + + wxCHECK_MSG( node, FALSE, "wrong index in image list" ); - if (index == m_images.Number()-1) - { - m_images.DeleteNode( node ); - m_images.Append( new wxBitmap(bitmap) ); - } - else - { - wxNode *next = node->Next(); - m_images.DeleteNode( node ); - m_images.Insert( next, new wxBitmap(bitmap) ); - } + if (index == m_images.Number()-1) + { + m_images.DeleteNode( node ); + m_images.Append( new wxBitmap(bitmap) ); + } + else + { + wxNode *next = node->Next(); + m_images.DeleteNode( node ); + m_images.Insert( next, new wxBitmap(bitmap) ); + } - return TRUE; + return TRUE; } bool wxImageList::Remove( int index ) { - wxNode *node = m_images.Nth( index ); - if (node) m_images.DeleteNode( node ); - return (node != NULL); + wxNode *node = m_images.Nth( index ); + + wxCHECK_MSG( node, FALSE, "wrong index in image list" ); + + m_images.DeleteNode( node ); + + return TRUE; } bool wxImageList::RemoveAll() { - m_images.Clear(); - return TRUE; + m_images.Clear(); + + return TRUE; } bool wxImageList::GetSize( int index, int &width, int &height ) const { - wxNode *node = m_images.Nth( index ); - if (node) - { + width = 0; + height = 0; + + wxNode *node = m_images.Nth( index ); + + wxCHECK_MSG( node, FALSE, "wrong index in image list" ); + wxBitmap *bm = (wxBitmap*)node->Data(); width = bm->GetWidth(); height = bm->GetHeight(); + return TRUE; - } - else - { - width = 0; - height = 0; - return FALSE; - } } bool wxImageList::Draw( int index, wxDC &dc, int x, int y, int flags, bool WXUNUSED(solidBackground) ) { - wxNode *node = m_images.Nth( index ); - if (!node) return FALSE; - wxBitmap *bm = (wxBitmap*)node->Data(); + wxNode *node = m_images.Nth( index ); + + wxCHECK_MSG( node, FALSE, "wrong index in image list" ); + + wxBitmap *bm = (wxBitmap*)node->Data(); - dc.DrawBitmap( *bm, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 ); + dc.DrawBitmap( *bm, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 ); - return TRUE; + return TRUE; } diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp index d8323989a0..be712e3d01 100644 --- a/src/gtk/tbargtk.cpp +++ b/src/gtk/tbargtk.cpp @@ -117,6 +117,18 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id, m_widget = GTK_WIDGET(m_toolbar); gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE ); + + m_fg.red = 0; + m_fg.green = 0; + m_fg.blue = 0; + gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ), &m_fg ); + + m_bg.red = 65535; + m_bg.green = 65535; + m_bg.blue = 50000; + gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ), &m_bg ); + + gtk_tooltips_set_colors( GTK_TOOLBAR(m_toolbar)->tooltips, &m_bg, &m_fg ); gtk_toolbar_append_space( m_toolbar ); diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp index d8323989a0..be712e3d01 100644 --- a/src/gtk1/tbargtk.cpp +++ b/src/gtk1/tbargtk.cpp @@ -117,6 +117,18 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id, m_widget = GTK_WIDGET(m_toolbar); gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE ); + + m_fg.red = 0; + m_fg.green = 0; + m_fg.blue = 0; + gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ), &m_fg ); + + m_bg.red = 65535; + m_bg.green = 65535; + m_bg.blue = 50000; + gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ), &m_bg ); + + gtk_tooltips_set_colors( GTK_TOOLBAR(m_toolbar)->tooltips, &m_bg, &m_fg ); gtk_toolbar_append_space( m_toolbar ); diff --git a/utils/dialoged/src/reseditr.cpp b/utils/dialoged/src/reseditr.cpp index e6c91ac886..401428b1bc 100644 --- a/utils/dialoged/src/reseditr.cpp +++ b/utils/dialoged/src/reseditr.cpp @@ -86,6 +86,11 @@ wxResourceManager *wxResourceManager::sm_currentResourceManager = NULL; #include "bitmaps/toback.xpm" #include "bitmaps/help.xpm" #include "bitmaps/wxwin.xpm" + +#include "bitmaps/dialog.xpm" +#include "bitmaps/folder1.xpm" +#include "bitmaps/folder2.xpm" +#include "bitmaps/buttonsm.xpm" #endif /* @@ -187,11 +192,16 @@ bool wxResourceManager::Initialize() wxIcon icon2("FOLDER1_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16); wxIcon icon3("FOLDER2_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16); wxIcon icon4("BUTTONSM_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16); +#else + wxIcon icon1( dialog_xpm ); + wxIcon icon2( folder1_xpm ); + wxIcon icon3( folder2_xpm ); + wxIcon icon4( buttonsm_xpm ); +#endif m_imageList.Add(icon1); m_imageList.Add(icon2); m_imageList.Add(icon3); m_imageList.Add(icon4); -#endif m_symbolTable.AddStandardSymbols(); diff --git a/wx-config.in b/wx-config.in index c7cd055f11..a960ca8945 100755 --- a/wx-config.in +++ b/wx-config.in @@ -43,7 +43,7 @@ while test $# -gt 0; do includes=-I@includedir@ fi includes="$includes -I@libdir@/wx/include" - echo $includes -D@TOOLKIT_DEF@ @GUI_TK_INCLUDE@ @OPTIMISE@ @PROFILE@ @WXDEBUG@ @WXDEBUG_DEFINE@ + echo $includes -D@TOOLKIT_DEF@ @GUI_TK_INCLUDE@ @WXDEBUG_DEFINE@ ;; --libs) -- 2.47.2