Return an invalid item from wxDataViewCtrl::GetItemByRow() for invalid rows.

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

diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp
index d65eaae68aa84446118a1c5af773b51f620e7610..109281084a87bcb6ce07c85344c09c54332f84d2 100644 (file)
--- a/src/gtk1/bmpbuttn.cpp
+++ b/src/gtk1/bmpbuttn.cpp
@@ -64,7 +64,7 @@ static void gtk_bmpbutton_enter_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 

-    button->HasFocus();
+    button->GTKSetHasFocus();

 }
 }
 
 }
 }
 


@@ -78,7 +78,7 @@ static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 

-    button->NotFocus();
+    button->GTKSetNotFocus();

 }
 }
 
 }
 }
 


@@ -114,8 +114,6 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma
 // wxBitmapButton
 //-----------------------------------------------------------------------------
 
 // wxBitmapButton
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)
-

 void wxBitmapButton::Init()
 {
     m_hasFocus =
 void wxBitmapButton::Init()
 {
     m_hasFocus =


@@ -141,14 +139,14 @@ bool wxBitmapButton::Create( wxWindow *parent,
         return false;
     }
 
         return false;
     }
 

-    m_bmpNormal = bitmap;
+    m_bitmaps[State_Normal] = bitmap;

 
     m_widget = gtk_button_new();
 
     if (style & wxNO_BORDER)
        gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
 
 
     m_widget = gtk_button_new();
 
     if (style & wxNO_BORDER)
        gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
 

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

     {
         OnSetBitmap();
     }
     {
         OnSetBitmap();
     }


@@ -195,16 +193,18 @@ void wxBitmapButton::OnSetBitmap()
 
     wxBitmap the_one;
     if (!IsThisEnabled())
 
     wxBitmap the_one;
     if (!IsThisEnabled())

-        the_one = m_bmpDisabled;
-    else if (m_isSelected)
-        the_one = m_bmpSelected;
-    else if (m_hasFocus)
-        the_one = m_bmpFocus;
-    else
-        the_one = m_bmpNormal;
-
-    if (!the_one.Ok()) the_one = m_bmpNormal;
-    if (!the_one.Ok()) return;
+        the_one = GetBitmapDisabled();
+   else if (m_isSelected)
+     the_one = GetBitmapPressed();
+   else if (HasFocus())
+     the_one = GetBitmapFocus();
+
+   if (!the_one.IsOk())
+     {
+         the_one = GetBitmapLabel();
+         if (!the_one.IsOk())
+             return;
+     }

 
     GdkBitmap *mask = NULL;
     if (the_one.GetMask()) mask = the_one.GetMask()->GetBitmap();
 
     GdkBitmap *mask = NULL;
     if (the_one.GetMask()) mask = the_one.GetMask()->GetBitmap();


@@ -240,13 +240,13 @@ bool wxBitmapButton::Enable( bool enable )
     return true;
 }
 
     return true;
 }
 

-void wxBitmapButton::HasFocus()
+void wxBitmapButton::GTKSetHasFocus()

 {
     m_hasFocus = true;
     OnSetBitmap();
 }
 
 {
     m_hasFocus = true;
     OnSetBitmap();
 }
 

-void wxBitmapButton::NotFocus()
+void wxBitmapButton::GTKSetNotFocus()

 {
     m_hasFocus = false;
     OnSetBitmap();
 {
     m_hasFocus = false;
     OnSetBitmap();