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

diff --git a/include/wx/gtk/tbargtk.h b/include/wx/gtk/tbargtk.h
index ac405223433dc7d3a8df1a330099447783c79311..dc4320d42835904fe9cdcdb22a5c4920d736f33a 100644 (file)
--- 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);
 
     virtual void SetToolPacking(int packing);
     virtual void SetToolSeparation(int separation);
 

-  public:
+  // implementation

   
     GtkToolbar   *m_toolbar;
     wxList        m_tools;
   
     GtkToolbar   *m_toolbar;
     wxList        m_tools;

+    GdkColor      m_fg;
+    GdkColor      m_bg;

 };
 
 #endif
 };
 
 #endif

diff --git a/include/wx/gtk1/tbargtk.h b/include/wx/gtk1/tbargtk.h
index ac405223433dc7d3a8df1a330099447783c79311..dc4320d42835904fe9cdcdb22a5c4920d736f33a 100644 (file)
--- 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);
 
     virtual void SetToolPacking(int packing);
     virtual void SetToolSeparation(int separation);
 

-  public:
+  // implementation

   
     GtkToolbar   *m_toolbar;
     wxList        m_tools;
   
     GtkToolbar   *m_toolbar;
     wxList        m_tools;

+    GdkColor      m_fg;
+    GdkColor      m_bg;

 };
 
 #endif
 };
 
 #endif

diff --git a/samples/treectrl/treetest.h b/samples/treectrl/treetest.h
index fd921e2f640bcb1f148e3d6905083d408637cb73..9adacc8acf66a928eef9f1eb49727a1f2f18d6b2 100644 (file)
--- 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 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);
 
 
   void GetItemsRecursively(const wxTreeItemId& idParent, long cookie);
 

diff --git a/src/common/list.cpp b/src/common/list.cpp
index c6e0ebccb936e721ba533eb1f1b77a2fa0fc4765..b11a21e816d3a326474b2b6220db3a02997be9df 100644 (file)
--- 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;
 }
 
     return (wxNodeBase *)NULL;
 }

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index ad91a211e0a2032cc6c46fc18f031283b1a4b3a3..29ad9cdb7518cef1650a9f7b324d4083bbd23181 100644 (file)
--- 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) )
 {
 
 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()
 }
 
 wxImageList::~wxImageList()


@@ -32,90 +32,97 @@ wxImageList::~wxImageList()
 
 int wxImageList::GetImageCount() const
 {
 
 int wxImageList::GetImageCount() const
 {

-  return m_images.Number();
+    return m_images.Number();

 }
 
 bool wxImageList::Create()
 {
 }
 
 bool wxImageList::Create()
 {

-  m_images.DeleteContents( TRUE );
-  return TRUE;
+    m_images.DeleteContents( TRUE );
+    return TRUE;

 }
 
 int wxImageList::Add( const wxBitmap &bitmap )
 {
 }
 
 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*)node->Data();

-
-  return (wxBitmap *) NULL;

 }
     
 bool wxImageList::Replace( int index, const wxBitmap &bitmap )
 {
 }
     
 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 )
 {
 }
 
 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()
 {
 }
 
 bool wxImageList::RemoveAll()
 {

-  m_images.Clear();
-  return TRUE;
+    m_images.Clear();
+    
+    return TRUE;

 }
 
 bool wxImageList::GetSize( int index, int &width, int &height ) const
 {
 }
 
 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();
     wxBitmap *bm = (wxBitmap*)node->Data();
     width = bm->GetWidth();
     height = bm->GetHeight();

+    

     return TRUE;
     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) )
 {
 }
 
 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 d8323989a0d3ee32d919e3281d50731691ce01e1..be712e3d0195476d25f5353565b43a0582488ddb 100644 (file)
--- 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_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 );
   
 
   gtk_toolbar_append_space( m_toolbar );
   

diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp
index d8323989a0d3ee32d919e3281d50731691ce01e1..be712e3d0195476d25f5353565b43a0582488ddb 100644 (file)
--- 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_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 );
   
 
   gtk_toolbar_append_space( m_toolbar );
   

diff --git a/utils/dialoged/src/reseditr.cpp b/utils/dialoged/src/reseditr.cpp
index e6c91ac8862eaf9e27ef7698378d17c4a56d8ddd..401428b1bca067836aa98d636bdacef939269b62 100644 (file)
--- 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/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
 
 /*
 #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);
   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);
   m_imageList.Add(icon1);
   m_imageList.Add(icon2);
   m_imageList.Add(icon3);
   m_imageList.Add(icon4);

-#endif

 
   m_symbolTable.AddStandardSymbols();
 
 
   m_symbolTable.AddStandardSymbols();
 

diff --git a/wx-config.in b/wx-config.in
index c7cd055f1108a33bd1925fee58c19f68e72a97aa..a960ca8945fce111cd3ed273c02a173bfea3bdda 100755 (executable)
--- 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"
         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)
 
       ;;
     --libs)