Check for invalid items in generic wxDataViewCtrl::GetSelections().

[wxWidgets.git] / src / gtk1 / toolbar.cpp

diff --git a/src/gtk1/toolbar.cpp b/src/gtk1/toolbar.cpp
index 21ed937b0c01824e8f8c297788d39a9d5865112e..0ab3c6798be1a838add02ce515716b6f8657b504 100644 (file)
--- a/src/gtk1/toolbar.cpp
+++ b/src/gtk1/toolbar.cpp
@@ -122,7 +122,7 @@ public:
 
     void SetPixmap(const wxBitmap& bitmap)
     {
 
     void SetPixmap(const wxBitmap& bitmap)
     {

-        if (bitmap.Ok())
+        if (bitmap.IsOk())

         {
             GdkBitmap *mask = bitmap.GetMask() ? bitmap.GetMask()->GetBitmap()
                                                : NULL;
         {
             GdkBitmap *mask = bitmap.GetMask() ? bitmap.GetMask()->GetBitmap()
                                                : NULL;


@@ -357,7 +357,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
         {
             wxBitmap bitmap = tool->GetNormalBitmap();
 
         {
             wxBitmap bitmap = tool->GetNormalBitmap();
 

-            wxCHECK_MSG( bitmap.Ok(), false,
+            wxCHECK_MSG( bitmap.IsOk(), false,

                          wxT("invalid bitmap for wxToolBar icon") );
 
             wxCHECK_MSG( bitmap.GetBitmap() == NULL, false,
                          wxT("invalid bitmap for wxToolBar icon") );
 
             wxCHECK_MSG( bitmap.GetBitmap() == NULL, false,


@@ -597,9 +597,9 @@ void wxToolBar::SetToolShortHelp( int id, const wxString& helpString )
 void wxToolBar::OnInternalIdle()
 {
     wxCursor cursor = m_cursor;
 void wxToolBar::OnInternalIdle()
 {
     wxCursor cursor = m_cursor;

-    if (g_globalCursor.Ok()) cursor = g_globalCursor;
+    if (g_globalCursor.IsOk()) cursor = g_globalCursor;

 
 

-    if (cursor.Ok())
+    if (cursor.IsOk())

     {
         /* I now set the cursor the anew in every OnInternalIdle call
            as setting the cursor in a parent window also effects the
     {
         /* I now set the cursor the anew in every OnInternalIdle call
            as setting the cursor in a parent window also effects the