Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

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

diff --git a/src/univ/bmpbuttn.cpp b/src/univ/bmpbuttn.cpp
index 0230a0674ffb1110c6517ea256d7b2b2619028e1..f21e6aa2f72ac8499f27bec2f44698c2a4c1028b 100644 (file)
--- a/src/univ/bmpbuttn.cpp
+++ b/src/univ/bmpbuttn.cpp
@@ -38,8 +38,6 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
-

 BEGIN_EVENT_TABLE(wxBitmapButton, wxButton)
     EVT_SET_FOCUS(wxBitmapButton::OnSetFocus)
     EVT_KILL_FOCUS(wxBitmapButton::OnKillFocus)
 BEGIN_EVENT_TABLE(wxBitmapButton, wxButton)
     EVT_SET_FOCUS(wxBitmapButton::OnSetFocus)
     EVT_KILL_FOCUS(wxBitmapButton::OnKillFocus)


@@ -65,7 +63,7 @@ bool wxBitmapButton::Create(wxWindow *parent,
                            pos, size, style | wxBU_EXACTFIT, validator, name) )
         return false;
 
                            pos, size, style | wxBU_EXACTFIT, validator, name) )
         return false;
 

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

 
     return true;
 }
 
     return true;
 }


@@ -75,35 +73,30 @@ void wxBitmapButton::OnSetBitmap()
     wxBitmap bmp;
     if ( !IsEnabled() )
     {
     wxBitmap bmp;
     if ( !IsEnabled() )
     {

-        bmp = m_bmpDisabled;
+        bmp = GetBitmapDisabled();

     }
     else if ( IsPressed() )
     {
     }
     else if ( IsPressed() )
     {

-        bmp = m_bmpSelected;
+        bmp = GetBitmapPressed();

     }
     else if ( IsFocused() )
     {
     }
     else if ( IsFocused() )
     {

-        bmp = m_bmpFocus;
-    }
-    else
-    {
-        bmp = m_bmpNormal;
+        bmp = GetBitmapFocus();

     }
     }

+    //else: just leave it invalid, this means "normal" anyhow in ChangeBitmap()

 
     ChangeBitmap(bmp);
 }
 
 bool wxBitmapButton::ChangeBitmap(const wxBitmap& bmp)
 {
 
     ChangeBitmap(bmp);
 }
 
 bool wxBitmapButton::ChangeBitmap(const wxBitmap& bmp)
 {

-    wxBitmap bitmap = bmp.Ok() ? bmp : m_bmpNormal;
-    if ( bitmap != m_bitmap )
-    {
-        m_bitmap = bitmap;
+    wxBitmap bitmap = bmp.IsOk() ? bmp : GetBitmapLabel();
+    if ( bitmap.IsSameAs(m_bitmap) )
+        return false;

 
 

-        return true;
-    }
+    m_bitmap = bitmap;

 
 

-    return false;
+    return true;

 }
 
 bool wxBitmapButton::Enable(bool enable)
 }
 
 bool wxBitmapButton::Enable(bool enable)


@@ -111,7 +104,7 @@ bool wxBitmapButton::Enable(bool enable)
     if ( !wxButton::Enable(enable) )
         return false;
 
     if ( !wxButton::Enable(enable) )
         return false;
 

-    if ( !enable && ChangeBitmap(m_bmpDisabled) )
+    if ( !enable && ChangeBitmap(GetBitmapDisabled()) )

         Refresh();
 
     return true;
         Refresh();
 
     return true;


@@ -119,14 +112,14 @@ bool wxBitmapButton::Enable(bool enable)
 
 bool wxBitmapButton::SetCurrent(bool doit)
 {
 
 bool wxBitmapButton::SetCurrent(bool doit)
 {

-    ChangeBitmap(doit ? m_bmpFocus : m_bmpNormal);
+    ChangeBitmap(doit ? GetBitmapFocus() : GetBitmapLabel());

 
     return wxButton::SetCurrent(doit);
 }
 
 void wxBitmapButton::OnSetFocus(wxFocusEvent& event)
 {
 
     return wxButton::SetCurrent(doit);
 }
 
 void wxBitmapButton::OnSetFocus(wxFocusEvent& event)
 {

-    if ( ChangeBitmap(m_bmpFocus) )
+    if ( ChangeBitmap(GetBitmapFocus()) )

         Refresh();
 
     event.Skip();
         Refresh();
 
     event.Skip();


@@ -134,7 +127,7 @@ void wxBitmapButton::OnSetFocus(wxFocusEvent& event)
 
 void wxBitmapButton::OnKillFocus(wxFocusEvent& event)
 {
 
 void wxBitmapButton::OnKillFocus(wxFocusEvent& event)
 {

-    if ( ChangeBitmap(m_bmpNormal) )
+    if ( ChangeBitmap(GetBitmapLabel()) )

         Refresh();
 
     event.Skip();
         Refresh();
 
     event.Skip();


@@ -142,14 +135,14 @@ void wxBitmapButton::OnKillFocus(wxFocusEvent& event)
 
 void wxBitmapButton::Press()
 {
 
 void wxBitmapButton::Press()
 {

-    ChangeBitmap(m_bmpSelected);
+    ChangeBitmap(GetBitmapPressed());

 
     wxButton::Press();
 }
 
 void wxBitmapButton::Release()
 {
 
     wxButton::Press();
 }
 
 void wxBitmapButton::Release()
 {

-    ChangeBitmap(IsFocused() ? m_bmpFocus : m_bmpNormal);
+    ChangeBitmap(IsFocused() ? GetBitmapFocus() : GetBitmapLabel());

 
     wxButton::Release();
 }
 
     wxButton::Release();
 }