X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/739730cae79b17ae0e254535dee9de18ace226e1..5c5ab9ebc3a7dd441c9e3b25cb3daf8f733c374f:/src/gtk1/dialog.cpp?ds=sidebyside

diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp
index ee60f258f2..6da4337b2e 100644
--- a/src/gtk1/dialog.cpp
+++ b/src/gtk1/dialog.cpp
@@ -14,9 +14,12 @@
 #include "wx/dialog.h"
 #include "wx/frame.h"
 #include "wx/app.h"
+#include "wx/cursor.h"
+
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------
@@ -25,6 +28,7 @@
 
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
+extern int g_openDialogs;
 
 //-----------------------------------------------------------------------------
 // data
@@ -32,13 +36,27 @@ extern bool g_isIdle;
 
 extern wxList wxPendingDelete;
 
+//-----------------------------------------------------------------------------
+// "focus" from m_window
+//-----------------------------------------------------------------------------
+
+static gint gtk_dialog_focus_callback( GtkWidget *widget, GtkDirectionType WXUNUSED(d), wxWindow *WXUNUSED(win) )
+{
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    // This disables GTK's tab traversal
+    gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "focus" );
+    return TRUE;
+}
+
 //-----------------------------------------------------------------------------
 // "delete_event"
 //-----------------------------------------------------------------------------
 
 bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
 {
-    if (g_isIdle) 
+    if (g_isIdle)
         wxapp_install_idle_handler();
 
     win->Close();
@@ -52,7 +70,7 @@ bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED
 
 static void gtk_dialog_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxDialog *win )
 {
-    if (g_isIdle) 
+    if (g_isIdle)
         wxapp_install_idle_handler();
 
     if (!win->m_hasVMT) return;
@@ -69,15 +87,28 @@ static void gtk_dialog_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation
 // "configure_event"
 //-----------------------------------------------------------------------------
 
-static gint gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxDialog *win )
+static gint
+#if (GTK_MINOR_VERSION > 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) 
+    if (g_isIdle)
         wxapp_install_idle_handler();
 
     if (!win->m_hasVMT) return FALSE;
 
+#if (GTK_MINOR_VERSION > 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;
+#endif
 
     wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() );
     mevent.SetEventObject( win );
@@ -90,41 +121,33 @@ static gint gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEvent
 // "realize" from m_widget
 //-----------------------------------------------------------------------------
 
-/* we cannot MWM hints and icons before the widget has been realized, 
+/* we cannot MWM hints and icons before the widget has been realized,
    so we do this directly after realization */
 
-static gint 
+static gint
 gtk_dialog_realized_callback( GtkWidget *widget, wxDialog *win )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
-
-    /* reset the icon */
-    if (win->m_icon != wxNullIcon)
-    {
-        wxIcon icon( win->m_icon );
-        win->m_icon = wxNullIcon;
-        win->SetIcon( icon );
-    }
-    
-    return FALSE;
-}
-    
-//-----------------------------------------------------------------------------
-// "map" from m_widget
-//-----------------------------------------------------------------------------
+    if (g_isIdle)
+        wxapp_install_idle_handler();
 
-static gint 
-gtk_dialog_map_callback( GtkWidget *widget, wxDialog *win )
-{
-    /* I haven''t been able to set the position of
-       the dialog before it is shown, so I do it here */
+    /* I haven't been able to set the position of
+       the dialog before it is shown, so I set the
+       position in "realize" */
     gtk_widget_set_uposition( widget, win->m_x, win->m_y );
-    
+
     /* all this is for Motif Window Manager "hints" and is supposed to be
        recognized by other WM as well. not tested. */
     long decor = (long) GDK_DECOR_BORDER;
     long func = (long) GDK_FUNC_MOVE ;
-    
+
+    /* Some WM don't display any border around the frame contents if
+       used with these hints, so we add a resize border around it,
+       without automatically allowinng it to be resized though.
+
+       This avoids the problem, but looks odd. What shall we do?
+    */
+    decor |= GDK_DECOR_RESIZEH;
+
     if ((win->GetWindowStyle() & wxCAPTION) != 0)
         decor |= GDK_DECOR_TITLE;
     if ((win->GetWindowStyle() & wxSYSTEM_MENU) != 0)
@@ -140,7 +163,7 @@ gtk_dialog_map_callback( GtkWidget *widget, wxDialog *win )
     if ((win->GetWindowStyle() & wxMAXIMIZE_BOX) != 0)
     {
         decor |= GDK_DECOR_MAXIMIZE;
-        func |= GDK_FUNC_MAXIMIZE;           
+        func |= GDK_FUNC_MAXIMIZE;
     }
     if ((win->GetWindowStyle() & wxRESIZE_BORDER) != 0)
     {
@@ -149,16 +172,63 @@ gtk_dialog_map_callback( GtkWidget *widget, wxDialog *win )
     }
     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->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);
-    
+
+    /* set size hints */
+    gint flag = 0; // GDK_HINT_POS;
+    if ((win->GetMinWidth() != -1) || (win->GetMinHeight() != -1)) flag |= GDK_HINT_MIN_SIZE;
+    if ((win->GetMaxWidth() != -1) || (win->GetMaxHeight() != -1)) flag |= GDK_HINT_MAX_SIZE;
+    if (flag)
+    {
+        gdk_window_set_hints( win->m_widget->window,
+                              win->m_x, win->m_y,
+                              win->GetMinWidth(), win->GetMinHeight(),
+                              win->GetMaxWidth(), win->GetMaxHeight(),
+                              flag );
+    }
+
+    /* reset the icon */
+    if (win->m_icon != wxNullIcon)
+    {
+        wxIcon icon( win->m_icon );
+        win->m_icon = wxNullIcon;
+        win->SetIcon( icon );
+    }
+
     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_pizza_put( GTK_PIZZA(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
 //-----------------------------------------------------------------------------
@@ -178,6 +248,7 @@ void wxDialog::Init()
     m_returnCode = 0;
     m_sizeSet = FALSE;
     m_modalShowing = FALSE;
+    m_isFrame = TRUE;
 }
 
 wxDialog::wxDialog( wxWindow *parent,
@@ -195,23 +266,38 @@ bool wxDialog::Create( wxWindow *parent,
                        const wxPoint &pos, const wxSize &size,
                        long style, const wxString &name )
 {
+    g_openDialogs++;
+
     wxTopLevelWindows.Append( this );
 
     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( wxT("wxDialog creation failed") );
+        return FALSE;
+    }
+
+    // All dialogs should really have this style
+    m_windowStyle |= wxTAB_TRAVERSAL;
+
+    m_insertCallback = (wxInsertChildFunction) wxInsertChildInDialog;
+
+    m_widget = gtk_window_new( GTK_WINDOW_DIALOG );
+
+    if ((m_parent) && (GTK_IS_WINDOW(m_parent->m_widget)))
+        gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(m_parent->m_widget) );
 
-    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_signal_connect( GTK_OBJECT(m_widget), "delete_event",
         GTK_SIGNAL_FUNC(gtk_dialog_delete_callback), (gpointer)this );
 
-    m_wxwindow = gtk_myfixed_new();
+    m_wxwindow = gtk_pizza_new();
     gtk_widget_show( m_wxwindow );
     GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
 
@@ -228,11 +314,6 @@ bool wxDialog::Create( wxWindow *parent,
     gtk_signal_connect( GTK_OBJECT(m_widget), "realize",
                         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",
-                        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",
         GTK_SIGNAL_FUNC(gtk_dialog_size_callback), (gpointer)this );
@@ -240,11 +321,17 @@ bool wxDialog::Create( wxWindow *parent,
     gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event",
         GTK_SIGNAL_FUNC(gtk_dialog_configure_callback), (gpointer)this );
 
+    /* disable native tab traversal */
+    gtk_signal_connect( GTK_OBJECT(m_widget), "focus",
+        GTK_SIGNAL_FUNC(gtk_dialog_focus_callback), (gpointer)this );
+
     return TRUE;
 }
 
 wxDialog::~wxDialog()
 {
+    m_isBeingDeleted = TRUE;
+
     wxTopLevelWindows.DeleteObject( this );
 
     if (wxTheApp->GetTopWindow() == this)
@@ -252,16 +339,19 @@ wxDialog::~wxDialog()
         wxTheApp->SetTopWindow( (wxWindow*) NULL );
     }
 
-    if (wxTopLevelWindows.Number() == 0)
+    if ((wxTopLevelWindows.Number() == 0) &&
+        (wxTheApp->GetExitOnFrameDelete()))
     {
         wxTheApp->ExitMainLoop();
     }
+    
+    g_openDialogs--;
 }
 
 void wxDialog::SetTitle( const wxString& title )
 {
     m_title = title;
-    if (m_title.IsNull()) m_title = _T("");
+    if (m_title.IsNull()) m_title = wxT("");
     gtk_window_set_title( GTK_WINDOW(m_widget), m_title.mbc_str() );
 }
 
@@ -290,18 +380,14 @@ void wxDialog::OnCancel( wxCommandEvent &WXUNUSED(event) )
 
 void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) )
 {
-    printf( "OnOK 1.\n" );
     if (Validate() && TransferDataFromWindow())
     {
-        printf( "OnOK 2.\n" );
         if (IsModal())
         {
-            printf( "OnOK: modal.\n" );
             EndModal(wxID_OK);
         }
         else
         {
-            printf( "OnOK: non-modal.\n" );
             SetReturnCode(wxID_OK);
             this->Show(FALSE);
         }
@@ -313,7 +399,7 @@ void wxDialog::OnPaint( wxPaintEvent& WXUNUSED(event) )
     // yes
 }
 
-void wxDialog::OnCloseWindow(wxCloseEvent& event)
+void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 {
     // We'll send a Cancel message by default,
     // which may close the dialog.
@@ -351,13 +437,15 @@ bool wxDialog::Destroy()
 
 void wxDialog::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
-    wxASSERT_MSG( (m_widget != NULL), _T("invalid dialog") );
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid dialog") );
 
+#if wxUSE_CONSTRAINTS
     if (GetAutoLayout())
     {
         Layout();
     }
     else
+#endif // wxUSE_CONSTRAINTS
     {
         /* no child: go out ! */
         if (!GetChildren().First()) return;
@@ -382,20 +470,26 @@ void wxDialog::OnSize( wxSizeEvent &WXUNUSED(event) )
     }
 }
 
+void wxDialog::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height) )
+{
+    wxFAIL_MSG( wxT("DoMoveWindow called for wxDialog") );
+}
+    
 void wxDialog::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {
-    wxASSERT_MSG( (m_widget != NULL), _T("invalid dialog") );
-    wxASSERT_MSG( (m_wxwindow != NULL), _T("invalid dialog") );
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid dialog") );
+    wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid dialog") );
 
     if (m_resizing) return; /* I don't like recursions */
     m_resizing = TRUE;
 
     int old_x = m_x;
     int old_y = m_y;
+
     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;
@@ -410,6 +504,7 @@ void wxDialog::DoSetSize( int x, int y, int width, int height, int sizeFlags )
         m_height = height;
     }
 
+/*
     if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)
     {
         if (width == -1) m_width = 80;
@@ -419,6 +514,7 @@ void wxDialog::DoSetSize( int x, int y, int width, int height, int sizeFlags )
     {
        if (height == -1) m_height = 26;
     }
+*/
 
     if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
     if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;
@@ -472,23 +568,12 @@ void wxDialog::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int heigh
     GetEventHandler()->ProcessEvent( event );
 }
 
-void wxDialog::Centre( int direction )
-{
-    wxASSERT_MSG( (m_widget != NULL), _T("invalid dialog") );
-
-    int x = 0;
-    int y = 0;
-
-    if ((direction & wxHORIZONTAL) == wxHORIZONTAL) x = (gdk_screen_width () - m_width) / 2;
-    if ((direction & wxVERTICAL) == wxVERTICAL) y = (gdk_screen_height () - m_height) / 2;
-
-    Move( x, y );
-}
-
 void wxDialog::OnInternalIdle()
 {
     if (!m_sizeSet && GTK_WIDGET_REALIZED(m_wxwindow))
         GtkOnSize( m_x, m_y, m_width, m_height );
+
+    wxWindow::OnInternalIdle();
 }
 
 bool wxDialog::Show( bool show )
@@ -528,17 +613,19 @@ void wxDialog::SetModal( bool WXUNUSED(flag) )
   else
     if (m_windowStyle & wxDIALOG_MODAL) m_windowStyle -= wxDIALOG_MODAL;
 */
-    wxFAIL_MSG( _T("wxDialog:SetModal obsolete now") );
+    wxFAIL_MSG( wxT("wxDialog:SetModal obsolete now") );
 }
 
 int wxDialog::ShowModal()
 {
     if (IsModal())
     {
-       wxFAIL_MSG( _T("wxDialog:ShowModal called twice") );
+       wxFAIL_MSG( wxT("wxDialog:ShowModal called twice") );
        return GetReturnCode();
     }
 
+    wxBusyCursorSuspender cs; // temporarily suppress the busy cursor
+
     Show( TRUE );
 
     m_modalShowing = TRUE;
@@ -556,7 +643,7 @@ void wxDialog::EndModal( int retCode )
 
     if (!IsModal())
     {
-        wxFAIL_MSG( _T("wxDialog:EndModal called twice") );
+        wxFAIL_MSG( wxT("wxDialog:EndModal called twice") );
         return;
     }
 
@@ -577,6 +664,8 @@ void wxDialog::SetIcon( const wxIcon &icon )
     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();