attempts at making modal dialogs without parent work - failed

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

diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp
index 7bfc477e35f54819d4a66952fbe8d6eae66f1ef9..b056ecbcbd747bdb126dd81f1a447f049e491d36 100644 (file)
--- a/src/gtk/bmpbuttn.cpp
+++ b/src/gtk/bmpbuttn.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        bmpbuttn.cpp
+// Name:        gtk/bmpbuttn.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -15,8 +15,8 @@
 
 #if wxUSE_BMPBUTTON
 
 
 #if wxUSE_BMPBUTTON
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // classes
 
 //-----------------------------------------------------------------------------
 // classes


@@ -43,11 +43,12 @@ extern bool   g_blockEventsOnDrag;
 
 static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
 {
 
 static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
+    if (g_isIdle)
+        wxapp_install_idle_handler();

 
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;

-  
+

     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
     event.SetEventObject(button);
     button->GetEventHandler()->ProcessEvent(event);
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
     event.SetEventObject(button);
     button->GetEventHandler()->ProcessEvent(event);


@@ -62,7 +63,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->HasFocus();

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -74,7 +75,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->NotFocus();

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


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

-    button->StartSelect(); 
+    button->StartSelect();

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -98,105 +99,107 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 

-    button->EndSelect(); 
+    button->EndSelect();

 }
 
 //-----------------------------------------------------------------------------
 // wxBitmapButton
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // wxBitmapButton
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)

 
 wxBitmapButton::wxBitmapButton()
 {
 }
 
 bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
 
 wxBitmapButton::wxBitmapButton()
 {
 }
 
 bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,

-                             const wxPoint &pos, const wxSize &size, 
+                             const wxPoint &pos, const wxSize &size,

                              long style, const wxValidator& validator, const wxString &name )
 {
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
                              long style, const wxValidator& validator, const wxString &name )
 {
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;

-  
-    wxSize newSize = size;

 
 

-    PreCreation( parent, id, pos, newSize, style, name );
-  
-#if wxUSE_VALIDATORS
-    SetValidator( validator );
-#endif
+    m_marginX =
+    m_marginY = 0;
+
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( wxT("wxBitmapButton creation failed") );
+        return FALSE;
+    }

 
     m_bitmap   = bitmap;
     m_disabled = bitmap;
     m_focus    = bitmap;
     m_selected = bitmap;
 
     m_bitmap   = bitmap;
     m_disabled = bitmap;
     m_focus    = bitmap;
     m_selected = bitmap;

-  
-    m_label = "";
-  
+

     m_widget = gtk_button_new();
 
     m_widget = gtk_button_new();
 

-#if (GTK_MINOR_VERSION > 0)    
+#if (GTK_MINOR_VERSION > 0)

     if (style & wxNO_BORDER)
        gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
 #endif
 
     if (m_bitmap.Ok())
     {
     if (style & wxNO_BORDER)
        gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
 #endif
 
     if (m_bitmap.Ok())
     {

+        wxSize newSize = size;
+

         GdkBitmap *mask = (GdkBitmap *) NULL;
         if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap();
         GtkWidget *pixmap = gtk_pixmap_new( m_bitmap.GetPixmap(), mask );
         GdkBitmap *mask = (GdkBitmap *) NULL;
         if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap();
         GtkWidget *pixmap = gtk_pixmap_new( m_bitmap.GetPixmap(), mask );

-    
+

         gtk_widget_show( pixmap );
         gtk_container_add( GTK_CONTAINER(m_widget), pixmap );
         gtk_widget_show( pixmap );
         gtk_container_add( GTK_CONTAINER(m_widget), pixmap );

-       
+

         int border = 10;
         if (style & wxNO_BORDER) border = 4;
         if (newSize.x == -1) newSize.x = m_bitmap.GetWidth()+border;
         if (newSize.y == -1) newSize.y = m_bitmap.GetHeight()+border;
         SetSize( newSize.x, newSize.y );
     }
         int border = 10;
         if (style & wxNO_BORDER) border = 4;
         if (newSize.x == -1) newSize.x = m_bitmap.GetWidth()+border;
         if (newSize.y == -1) newSize.y = m_bitmap.GetHeight()+border;
         SetSize( newSize.x, newSize.y );
     }

-  
-    gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", 
+
+    gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",

       GTK_SIGNAL_FUNC(gtk_bmpbutton_clicked_callback), (gpointer*)this );
 
       GTK_SIGNAL_FUNC(gtk_bmpbutton_clicked_callback), (gpointer*)this );
 

-    gtk_signal_connect( GTK_OBJECT(m_widget), "enter", 
+    gtk_signal_connect( GTK_OBJECT(m_widget), "enter",

       GTK_SIGNAL_FUNC(gtk_bmpbutton_enter_callback), (gpointer*)this );
       GTK_SIGNAL_FUNC(gtk_bmpbutton_enter_callback), (gpointer*)this );

-    gtk_signal_connect( GTK_OBJECT(m_widget), "leave", 
+    gtk_signal_connect( GTK_OBJECT(m_widget), "leave",

       GTK_SIGNAL_FUNC(gtk_bmpbutton_leave_callback), (gpointer*)this );
       GTK_SIGNAL_FUNC(gtk_bmpbutton_leave_callback), (gpointer*)this );

-    gtk_signal_connect( GTK_OBJECT(m_widget), "pressed", 
+    gtk_signal_connect( GTK_OBJECT(m_widget), "pressed",

       GTK_SIGNAL_FUNC(gtk_bmpbutton_press_callback), (gpointer*)this );
       GTK_SIGNAL_FUNC(gtk_bmpbutton_press_callback), (gpointer*)this );

-    gtk_signal_connect( GTK_OBJECT(m_widget), "released", 
+    gtk_signal_connect( GTK_OBJECT(m_widget), "released",

       GTK_SIGNAL_FUNC(gtk_bmpbutton_release_callback), (gpointer*)this );
       GTK_SIGNAL_FUNC(gtk_bmpbutton_release_callback), (gpointer*)this );

- 
+

     m_parent->DoAddChild( this );
     m_parent->DoAddChild( this );

-  
+

     PostCreation();
     PostCreation();

-  
+

     SetBackgroundColour( parent->GetBackgroundColour() );
 
     Show( TRUE );
     SetBackgroundColour( parent->GetBackgroundColour() );
 
     Show( TRUE );

-    
+

     return TRUE;
 }
     return TRUE;
 }

-      
+

 void wxBitmapButton::SetDefault()
 {
     GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT );
     gtk_widget_grab_default( m_widget );
 void wxBitmapButton::SetDefault()
 {
     GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT );
     gtk_widget_grab_default( m_widget );

-    
+

     SetSize( m_x, m_y, m_width, m_height );
 }
 
 void wxBitmapButton::SetLabel( const wxString &label )
 {
     SetSize( m_x, m_y, m_width, m_height );
 }
 
 void wxBitmapButton::SetLabel( const wxString &label )
 {

-    wxCHECK_RET( m_widget != NULL, _T("invalid button") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid button") );

 
     wxControl::SetLabel( label );
 }
 
 wxString wxBitmapButton::GetLabel() const
 {
 
     wxControl::SetLabel( label );
 }
 
 wxString wxBitmapButton::GetLabel() const
 {

-    wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid button") );
+    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid button") );

 
     return wxControl::GetLabel();
 }
 
     return wxControl::GetLabel();
 }


@@ -207,42 +210,42 @@ void wxBitmapButton::ApplyWidgetStyle()
 
 void wxBitmapButton::SetBitmap()
 {
 
 void wxBitmapButton::SetBitmap()
 {

-    wxCHECK_RET( m_widget != NULL, _T("invalid button") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid button") );

 
     wxBitmap the_one;
 
     wxBitmap the_one;

-  
-    if (!m_isEnabled) 
+
+    if (!m_isEnabled)

         the_one = m_disabled;
         the_one = m_disabled;

-    else 
+    else

     {
     {

-        if (m_isSelected) 
-       {
-           the_one = m_selected;
-       }
-        else 
-       {
-            if (m_hasFocus) 
-               the_one = m_focus;
-            else 
-               the_one = m_bitmap;
+        if (m_isSelected)
+        {
+            the_one = m_selected;
+        }
+        else
+        {
+            if (m_hasFocus)
+                the_one = m_focus;
+            else
+                the_one = m_bitmap;

         }
     }
 
     if (!the_one.Ok()) the_one = m_bitmap;
     if (!the_one.Ok()) return;
         }
     }
 
     if (!the_one.Ok()) the_one = m_bitmap;
     if (!the_one.Ok()) return;

-  
+

     GtkButton *bin = GTK_BUTTON( m_widget );
     GtkPixmap *g_pixmap = GTK_PIXMAP( bin->child );
     GtkButton *bin = GTK_BUTTON( m_widget );
     GtkPixmap *g_pixmap = GTK_PIXMAP( bin->child );

-  
+

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

-  
+

     gtk_pixmap_set( g_pixmap, the_one.GetPixmap(), mask );
 }
 
     gtk_pixmap_set( g_pixmap, the_one.GetPixmap(), mask );
 }
 

-void wxBitmapButton::SetBitmapDisabled( const wxBitmap& bitmap ) 
+void wxBitmapButton::SetBitmapDisabled( const wxBitmap& bitmap )

 {
 {

-  wxCHECK_RET( m_widget != NULL, _T("invalid button") );
+  wxCHECK_RET( m_widget != NULL, wxT("invalid button") );

 
   if ( ! m_disabled.Ok() ) return;
   m_disabled = bitmap;
 
   if ( ! m_disabled.Ok() ) return;
   m_disabled = bitmap;


@@ -250,9 +253,9 @@ void wxBitmapButton::SetBitmapDisabled( const wxBitmap& bitmap )
   SetBitmap();
 }
 
   SetBitmap();
 }
 

-void wxBitmapButton::SetBitmapFocus( const wxBitmap& bitmap ) 
+void wxBitmapButton::SetBitmapFocus( const wxBitmap& bitmap )

 {
 {

-    wxCHECK_RET( m_widget != NULL, _T("invalid button") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid button") );

 
     if ( ! m_focus.Ok() ) return;
     m_focus = bitmap;
 
     if ( ! m_focus.Ok() ) return;
     m_focus = bitmap;


@@ -262,17 +265,17 @@ void wxBitmapButton::SetBitmapFocus( const wxBitmap& bitmap )
 
 void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap )
 {
 
 void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap )
 {

-    wxCHECK_RET( m_widget != NULL, _T("invalid button") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid button") );

 
     if (!m_bitmap.Ok()) return;
     m_bitmap = bitmap;
 
     if (!m_bitmap.Ok()) return;
     m_bitmap = bitmap;

-  
+

     SetBitmap();
 }
 
 void wxBitmapButton::SetBitmapSelected( const wxBitmap& bitmap )
 {
     SetBitmap();
 }
 
 void wxBitmapButton::SetBitmapSelected( const wxBitmap& bitmap )
 {

-    wxCHECK_RET( m_widget != NULL, _T("invalid button") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid button") );

 
     if ( ! m_selected.Ok() ) return;
     m_selected = bitmap;
 
     if ( ! m_selected.Ok() ) return;
     m_selected = bitmap;


@@ -314,4 +317,5 @@ void wxBitmapButton::EndSelect()
     SetBitmap();
 }
 
     SetBitmap();
 }
 

-#endif
\ No newline at end of file
+#endif // wxUSE_BMPBUTTON
+