ambiguous ctor call resolved

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

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index 58b7ff2a51befbd6e814315a819213c4165c095b..9812ec9c7b98f3593e5ee8383657113df33be3af 100644 (file)
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -18,6 +18,7 @@
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"

+#include "wx/cursor.h"

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -38,14 +39,8 @@ extern wxList wxPendingDelete;
 
 bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
 {
 
 bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-
-/*
-    printf( "OnDelete from " );
-    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-        printf( win->GetClassInfo()->GetClassName() );
-    printf( ".\n" );
-*/
+    if (g_isIdle) 
+        wxapp_install_idle_handler();

 
     win->Close();
 
 
     win->Close();
 


@@ -58,37 +53,45 @@ bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED
 
 static void gtk_dialog_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxDialog *win )
 {
 
 static void gtk_dialog_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxDialog *win )
 {

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

 
 

-    if (!win->HasVMT()) return;
-
-/*
-    printf( "OnDialogResize from " );
-    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-        printf( win->GetClassInfo()->GetClassName() );
-    printf( ".\n" );
-*/
+    if (!win->m_hasVMT) return;

 
 

-   if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
-   {
-       win->m_sizeSet = FALSE;
-       win->m_width = alloc->width;
-       win->m_height = alloc->height;
-   }
+    if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
+    {
+        win->m_width = alloc->width;
+        win->m_height = alloc->height;
+        win->UpdateSize();
+    }

 }
 
 //-----------------------------------------------------------------------------
 // "configure_event"
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // "configure_event"
 //-----------------------------------------------------------------------------
 

-static gint gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxDialog *win )
+static gint 
+#if (GTK_MINOR_VERSON > 0)
+gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDialog *win )
+#else
+gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxDialog *win )
+#endif

 {
 {

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

 
 

-    if (!win->HasVMT()) return FALSE;
+    if (!win->m_hasVMT) return FALSE;

 
 

+#if (GTK_MINOR_VERSON > 0)
+    int x = 0;
+    int y = 0;
+    gdk_window_get_root_origin( win->m_widget->window, &x, &y );
+    win->m_x = x;
+    win->m_y = y;
+#else

     win->m_x = event->x;
     win->m_y = event->y;
     win->m_x = event->x;
     win->m_y = event->y;

+#endif

 
     wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() );
     mevent.SetEventObject( win );
 
     wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() );
     mevent.SetEventObject( win );


@@ -107,14 +110,20 @@ static gint gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEvent
 static gint 
 gtk_dialog_realized_callback( GtkWidget *widget, wxDialog *win )
 {
 static gint 
 gtk_dialog_realized_callback( GtkWidget *widget, wxDialog *win )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
+    if (g_isIdle) 
+        wxapp_install_idle_handler();
+
+    /* I haven''t been able to set the position of
+       the dialog before it is shown, so I set the
+       position in "realize" and "map" */
+    gtk_widget_set_uposition( widget, win->m_x, win->m_y );

 
     /* reset the icon */
     if (win->m_icon != wxNullIcon)
     {
         wxIcon icon( win->m_icon );
         win->m_icon = wxNullIcon;
 
     /* reset the icon */
     if (win->m_icon != wxNullIcon)
     {
         wxIcon icon( win->m_icon );
         win->m_icon = wxNullIcon;

-       win->SetIcon( icon );
+        win->SetIcon( icon );

     }
     
     return FALSE;
     }
     
     return FALSE;


@@ -127,8 +136,12 @@ gtk_dialog_realized_callback( GtkWidget *widget, wxDialog *win )
 static gint 
 gtk_dialog_map_callback( GtkWidget *widget, wxDialog *win )
 {
 static gint 
 gtk_dialog_map_callback( GtkWidget *widget, wxDialog *win )
 {

+    if (g_isIdle) 
+        wxapp_install_idle_handler();
+

     /* I haven''t been able to set the position of
     /* I haven''t been able to set the position of

-       the dialog before it is shown, so I do it here */
+       the dialog before it is shown, so I set the
+       position in "realize" and "map" */

     gtk_widget_set_uposition( widget, win->m_x, win->m_y );
     
     /* all this is for Motif Window Manager "hints" and is supposed to be
     gtk_widget_set_uposition( widget, win->m_x, win->m_y );
     
     /* all this is for Motif Window Manager "hints" and is supposed to be


@@ -136,36 +149,33 @@ gtk_dialog_map_callback( GtkWidget *widget, wxDialog *win )
     long decor = (long) GDK_DECOR_BORDER;
     long func = (long) GDK_FUNC_MOVE ;
     
     long decor = (long) GDK_DECOR_BORDER;
     long func = (long) GDK_FUNC_MOVE ;
     

-    if ((win->m_windowStyle & wxCAPTION) != 0)
-       decor |= GDK_DECOR_TITLE;
-    if ((win->m_windowStyle & wxSYSTEM_MENU) != 0)
+    if ((win->GetWindowStyle() & wxCAPTION) != 0)
+        decor |= GDK_DECOR_TITLE;
+    if ((win->GetWindowStyle() & wxSYSTEM_MENU) != 0)

     {
        decor |= GDK_DECOR_MENU;
        func |= GDK_FUNC_CLOSE;
     }
     {
        decor |= GDK_DECOR_MENU;
        func |= GDK_FUNC_CLOSE;
     }

-    if ((win->m_windowStyle & wxMINIMIZE_BOX) != 0)
+    if ((win->GetWindowStyle() & wxMINIMIZE_BOX) != 0)

     {
     {

-       func |= GDK_FUNC_MINIMIZE;
-       decor |= GDK_DECOR_MINIMIZE;
-        decor |= GDK_DECOR_BORDER;
+        func |= GDK_FUNC_MINIMIZE;
+        decor |= GDK_DECOR_MINIMIZE;

     }
     }

-    if ((win->m_windowStyle & wxMAXIMIZE_BOX) != 0)
+    if ((win->GetWindowStyle() & wxMAXIMIZE_BOX) != 0)

     {
     {

-       decor |= GDK_DECOR_MAXIMIZE;
-       func |= GDK_FUNC_MAXIMIZE;           
-        decor |= GDK_DECOR_BORDER;
+        decor |= GDK_DECOR_MAXIMIZE;
+        func |= GDK_FUNC_MAXIMIZE;           

     }
     }

-    if ((win->m_windowStyle & wxRESIZE_BORDER) != 0)
+    if ((win->GetWindowStyle() & wxRESIZE_BORDER) != 0)

     {
        func |= GDK_FUNC_RESIZE;
        decor |= GDK_DECOR_RESIZEH;
     {
        func |= GDK_FUNC_RESIZE;
        decor |= GDK_DECOR_RESIZEH;

-       decor |= GDK_DECOR_BORDER;

     }
     gdk_window_set_decorations( win->m_widget->window, (GdkWMDecoration)decor);
     gdk_window_set_functions( win->m_widget->window, (GdkWMFunction)func);
       
     /* GTK's shrinking/growing policy */
     }
     gdk_window_set_decorations( win->m_widget->window, (GdkWMDecoration)decor);
     gdk_window_set_functions( win->m_widget->window, (GdkWMFunction)func);
       
     /* GTK's shrinking/growing policy */

-    if ((win->m_windowStyle & wxRESIZE_BORDER) == 0)
+    if ((win->GetWindowStyle() & wxRESIZE_BORDER) == 0)

         gtk_window_set_policy(GTK_WINDOW(win->m_widget), 0, 0, 1);
     else
         gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1);
         gtk_window_set_policy(GTK_WINDOW(win->m_widget), 0, 0, 1);
     else
         gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1);


@@ -173,6 +183,32 @@ gtk_dialog_map_callback( GtkWidget *widget, wxDialog *win )
     return FALSE;
 }
     
     return FALSE;
 }
     

+//-----------------------------------------------------------------------------
+// InsertChild for wxDialog
+//-----------------------------------------------------------------------------
+
+/* Callback for wxFrame. This very strange beast has to be used because
+ * C++ has no virtual methods in a constructor. We have to emulate a
+ * virtual function here as wxWindows requires different ways to insert
+ * a child in container classes. */
+
+static void wxInsertChildInDialog( wxDialog* parent, wxWindow* child )
+{
+    gtk_myfixed_put( GTK_MYFIXED(parent->m_wxwindow),
+                     GTK_WIDGET(child->m_widget),
+                     child->m_x,
+                     child->m_y,
+                     child->m_width,
+                     child->m_height );
+
+    if (parent->HasFlag(wxTAB_TRAVERSAL))
+    {
+        /* we now allow a window to get the focus as long as it
+           doesn't have any children. */
+        GTK_WIDGET_UNSET_FLAGS( parent->m_wxwindow, GTK_CAN_FOCUS );
+    }
+}
+

 //-----------------------------------------------------------------------------
 // wxDialog
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxDialog
 //-----------------------------------------------------------------------------


@@ -189,6 +225,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxPanel)
 
 void wxDialog::Init()
 {
 
 void wxDialog::Init()
 {

+    m_returnCode = 0;

     m_sizeSet = FALSE;
     m_modalShowing = FALSE;
 }
     m_sizeSet = FALSE;
     m_modalShowing = FALSE;
 }


@@ -212,13 +249,22 @@ bool wxDialog::Create( wxWindow *parent,
 
     m_needParent = FALSE;
 
 
     m_needParent = FALSE;
 

-    PreCreation( parent, id, pos, size, style, name );
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+    {
+        wxFAIL_MSG( _T("wxDialog creation failed") );
+       return FALSE;
+    }

 
 

+    m_insertCallback = (wxInsertChildFunction) wxInsertChildInDialog;
+    

     m_widget = gtk_window_new( GTK_WINDOW_TOPLEVEL );
     m_widget = gtk_window_new( GTK_WINDOW_TOPLEVEL );

+    
+    if (!name.IsEmpty())
+        gtk_window_set_wmclass( GTK_WINDOW(m_widget), name.mb_str(), name.mb_str() );
+    

     GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
 
     GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
 

-    gtk_widget_set( m_widget, "GtkWindow::allow_shrink", TRUE, NULL);
-

     gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
         GTK_SIGNAL_FUNC(gtk_dialog_delete_callback), (gpointer)this );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
         GTK_SIGNAL_FUNC(gtk_dialog_delete_callback), (gpointer)this );
 


@@ -237,12 +283,12 @@ bool wxDialog::Create( wxWindow *parent,
     /*  we cannot set MWM hints  before the widget has
         been realized, so we do this directly after realization */
     gtk_signal_connect( GTK_OBJECT(m_widget), "realize",
     /*  we cannot set MWM hints  before the widget has
         been realized, so we do this directly after realization */
     gtk_signal_connect( GTK_OBJECT(m_widget), "realize",

-                       GTK_SIGNAL_FUNC(gtk_dialog_realized_callback), (gpointer) this );
+                        GTK_SIGNAL_FUNC(gtk_dialog_realized_callback), (gpointer) this );

 
     /* we set the position of the window after the map event. setting it
        before has no effect (with KWM) */
     gtk_signal_connect( GTK_OBJECT(m_widget), "map",
 
     /* we set the position of the window after the map event. setting it
        before has no effect (with KWM) */
     gtk_signal_connect( GTK_OBJECT(m_widget), "map",

-                       GTK_SIGNAL_FUNC(gtk_dialog_map_callback), (gpointer) this );
+                        GTK_SIGNAL_FUNC(gtk_dialog_map_callback), (gpointer) this );

 
     /* the user resized the frame by dragging etc. */
     gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
 
     /* the user resized the frame by dragging etc. */
     gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",


@@ -256,6 +302,8 @@ bool wxDialog::Create( wxWindow *parent,
 
 wxDialog::~wxDialog()
 {
 
 wxDialog::~wxDialog()
 {

+    m_isBeingDeleted = TRUE;
+    

     wxTopLevelWindows.DeleteObject( this );
 
     if (wxTheApp->GetTopWindow() == this)
     wxTopLevelWindows.DeleteObject( this );
 
     if (wxTheApp->GetTopWindow() == this)


@@ -295,13 +343,13 @@ void wxDialog::OnCancel( wxCommandEvent &WXUNUSED(event) )
     else
     {
         SetReturnCode(wxID_CANCEL);
     else
     {
         SetReturnCode(wxID_CANCEL);

-        this->Show(FALSE);
+        Show(FALSE);

     }
 }
 
 void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) )
 {
     }
 }
 
 void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) )
 {

-    if ( Validate() && TransferDataFromWindow())
+    if (Validate() && TransferDataFromWindow())

     {
         if (IsModal())
         {
     {
         if (IsModal())
         {


@@ -360,11 +408,13 @@ void wxDialog::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
     wxASSERT_MSG( (m_widget != NULL), _T("invalid dialog") );
 
 {
     wxASSERT_MSG( (m_widget != NULL), _T("invalid dialog") );
 

+#if wxUSE_CONSTRAINTS

     if (GetAutoLayout())
     {
         Layout();
     }
     else
     if (GetAutoLayout())
     {
         Layout();
     }
     else

+#endif // wxUSE_CONSTRAINTS

     {
         /* no child: go out ! */
         if (!GetChildren().First()) return;
     {
         /* no child: go out ! */
         if (!GetChildren().First()) return;


@@ -402,7 +452,7 @@ void wxDialog::DoSetSize( int x, int y, int width, int height, int sizeFlags )
     int old_width = m_width;
     int old_height = m_height;
 
     int old_width = m_width;
     int old_height = m_height;
 

-    if ((sizeFlags & wxSIZE_USE_EXISTING) == wxSIZE_USE_EXISTING)
+    if ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0)

     {
         if (x != -1) m_x = x;
         if (y != -1) m_y = y;
     {
         if (x != -1) m_x = x;
         if (y != -1) m_y = y;


@@ -435,17 +485,17 @@ void wxDialog::DoSetSize( int x, int y, int width, int height, int sizeFlags )
     if ((m_x != -1) || (m_y != -1))
     {
         if ((m_x != old_x) || (m_y != old_y))
     if ((m_x != -1) || (m_y != -1))
     {
         if ((m_x != old_x) || (m_y != old_y))

-       {
-           /* we set the position here and when showing the dialog
-              for the first time in idle time */
+        {
+            /* we set the position here and when showing the dialog
+               for the first time in idle time */

             gtk_widget_set_uposition( m_widget, m_x, m_y );
             gtk_widget_set_uposition( m_widget, m_x, m_y );

-       }
+        }

     }
 
     if ((m_width != old_width) || (m_height != old_height))
     {
         /* actual resizing is deferred to GtkOnSize in idle time and
     }
 
     if ((m_width != old_width) || (m_height != old_height))
     {
         /* actual resizing is deferred to GtkOnSize in idle time and

-          when showing the dialog */
+           when showing the dialog */

         m_sizeSet = FALSE;
     }
 
         m_sizeSet = FALSE;
     }
 


@@ -515,21 +565,11 @@ bool wxDialog::Show( bool show )
         GtkOnSize( m_x, m_y, m_width, m_height );
     }
 
         GtkOnSize( m_x, m_y, m_width, m_height );
     }
 

-    if (show != m_isShown)
-    {
-        if (show)
-       {
-           gtk_widget_show( m_widget );
-       }
-        else
-            gtk_widget_hide( m_widget );
-           
-        m_isShown = show;
-    }
+    bool ret = wxWindow::Show( show );

 
     if (show) InitDialog();
 
 
     if (show) InitDialog();
 

-    return TRUE;
+    return ret;

 }
 
 bool wxDialog::IsModal() const
 }
 
 bool wxDialog::IsModal() const


@@ -556,6 +596,8 @@ int wxDialog::ShowModal()
        return GetReturnCode();
     }
 
        return GetReturnCode();
     }
 

+    wxBusyCursorSuspender cs; // temporarily suppress the busy cursor
+    

     Show( TRUE );
 
     m_modalShowing = TRUE;
     Show( TRUE );
 
     m_modalShowing = TRUE;


@@ -594,6 +636,8 @@ void wxDialog::SetIcon( const wxIcon &icon )
     m_icon = icon;
     if (!icon.Ok()) return;
 
     m_icon = icon;
     if (!icon.Ok()) return;
 

+    if (!m_widget->window) return;
+

     wxMask *mask = icon.GetMask();
     GdkBitmap *bm = (GdkBitmap *) NULL;
     if (mask) bm = mask->GetBitmap();
     wxMask *mask = icon.GetMask();
     GdkBitmap *bm = (GdkBitmap *) NULL;
     if (mask) bm = mask->GetBitmap();