Fixed doubled-up key effects in wxTextCtrl by resetting m_lastMsg to 0

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

diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp
index bde6b7e6b4153ca540ed5bfe397c4695cb30bb44..822015862d24be615ad48589ae3bfa07b84f37a0 100644 (file)
--- a/src/gtk1/dialog.cpp
+++ b/src/gtk1/dialog.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

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

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


@@ -14,6 +14,9 @@
 #include "wx/dialog.h"
 #include "wx/frame.h"
 #include "wx/app.h"
 #include "wx/dialog.h"
 #include "wx/frame.h"
 #include "wx/app.h"

+
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"

 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------


@@ -25,14 +28,14 @@ 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 )

-{ 
+{

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

-  
+

     win->Close();
 
     return TRUE;
     win->Close();
 
     return TRUE;


@@ -53,7 +56,30 @@ static void gtk_dialog_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation
     printf( ".\n" );
 */
 
     printf( ".\n" );
 */
 

-    win->GtkOnSize( alloc->x, alloc->y, alloc->width, alloc->height );
+   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;
+   }
+}
+
+//-----------------------------------------------------------------------------
+// "configure_event"
+//-----------------------------------------------------------------------------
+
+static gint gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxDialog *win )
+{
+    if (!win->HasVMT()) return FALSE;
+
+    win->m_x = event->x;
+    win->m_y = event->y;
+
+    wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() );
+    mevent.SetEventObject( win );
+    win->GetEventHandler()->ProcessEvent( mevent );
+
+    return FALSE;

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


@@ -70,68 +96,77 @@ END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxPanel)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxPanel)
 

-wxDialog::wxDialog()
+void wxDialog::Init()

 {
 {

-    m_title = "";
+    m_sizeSet = FALSE;

     m_modalShowing = FALSE;
     m_modalShowing = FALSE;

-    wxTopLevelWindows.Insert( this );

 }
 
 }
 

-wxDialog::wxDialog( wxWindow *parent, 
+wxDialog::wxDialog( wxWindow *parent,

                     wxWindowID id, const wxString &title,
                     wxWindowID id, const wxString &title,

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

                     long style, const wxString &name )
 {
                     long style, const wxString &name )
 {

-    m_modalShowing = FALSE;
-    wxTopLevelWindows.Insert( this );
+    Init();
+

     Create( parent, id, title, pos, size, style, name );
 }
 
 bool wxDialog::Create( wxWindow *parent,
                        wxWindowID id, const wxString &title,
     Create( parent, id, title, pos, size, style, name );
 }
 
 bool wxDialog::Create( wxWindow *parent,
                        wxWindowID id, const wxString &title,

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

                        long style, const wxString &name )
 {
                        long style, const wxString &name )
 {

+    wxTopLevelWindows.Append( this );
+

     m_needParent = FALSE;
     m_needParent = FALSE;

-  
+

     PreCreation( parent, id, pos, size, style, name );
     PreCreation( parent, id, pos, size, style, name );

-  
+

     m_widget = gtk_window_new( GTK_WINDOW_TOPLEVEL );
     GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
     m_widget = gtk_window_new( GTK_WINDOW_TOPLEVEL );
     GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );

- 
+

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

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

         GTK_SIGNAL_FUNC(gtk_dialog_delete_callback), (gpointer)this );
         GTK_SIGNAL_FUNC(gtk_dialog_delete_callback), (gpointer)this );

-    
-    gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate", 
-        GTK_SIGNAL_FUNC(gtk_dialog_size_callback), (gpointer)this );
-    
+

     m_wxwindow = gtk_myfixed_new();
     gtk_widget_show( m_wxwindow );
     GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
     m_wxwindow = gtk_myfixed_new();
     gtk_widget_show( m_wxwindow );
     GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );

-  
+

     gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );
     gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );

-  
+

     SetTitle( title );
     SetTitle( title );

-  
-    if ((m_x != -1) || (m_y != -1))
-        gtk_widget_set_uposition( m_widget, m_x, m_y );
-     
-    gtk_widget_set_usize( m_widget, m_width, m_height );
-     
+

     if (m_parent) m_parent->AddChild( this );
     if (m_parent) m_parent->AddChild( this );

-  
-  
+

     PostCreation();
     PostCreation();

-  
+
+    gtk_widget_realize( m_widget );
+
+    gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
+        GTK_SIGNAL_FUNC(gtk_dialog_size_callback), (gpointer)this );
+
+    gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event",
+        GTK_SIGNAL_FUNC(gtk_dialog_configure_callback), (gpointer)this );
+

     return TRUE;
 }
 
 wxDialog::~wxDialog()
 {
     wxTopLevelWindows.DeleteObject( this );
     return TRUE;
 }
 
 wxDialog::~wxDialog()
 {
     wxTopLevelWindows.DeleteObject( this );

-    if (wxTopLevelWindows.Number() == 0) wxTheApp->ExitMainLoop();
+
+    if (wxTheApp->GetTopWindow() == this)
+    {
+        wxTheApp->SetTopWindow( (wxWindow*) NULL );
+    }
+
+    if (wxTopLevelWindows.Number() == 0)
+    {
+        wxTheApp->ExitMainLoop();
+    }

 }
 
 void wxDialog::SetTitle( const wxString& title )
 }
 
 void wxDialog::SetTitle( const wxString& title )


@@ -168,7 +203,7 @@ void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) )
 {
     if ( Validate() && TransferDataFromWindow())
     {
 {
     if ( Validate() && TransferDataFromWindow())
     {

-        if (IsModal()) 
+        if (IsModal())

         {
             EndModal(wxID_OK);
         }
         {
             EndModal(wxID_OK);
         }


@@ -182,23 +217,36 @@ void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) )
 
 void wxDialog::OnPaint( wxPaintEvent& WXUNUSED(event) )
 {
 
 void wxDialog::OnPaint( wxPaintEvent& WXUNUSED(event) )
 {

-  // yes
+    // yes

 }
 
 }
 

-bool wxDialog::OnClose()
+void wxDialog::OnCloseWindow(wxCloseEvent& event)

 {
 {

+    // We'll send a Cancel message by default,
+    // which may close the dialog.
+    // Check for looping if the Cancel event handler calls Close().
+
+    // Note that if a cancel button and handler aren't present in the dialog,
+    // nothing will happen when you close the dialog via the window manager, or
+    // via Close().
+    // We wouldn't want to destroy the dialog by default, since the dialog may have been
+    // created on the stack.
+    // However, this does mean that calling dialog->Close() won't delete the dialog
+    // unless the handler for wxID_CANCEL does so. So use Destroy() if you want to be
+    // sure to destroy the dialog.
+    // The default OnCancel (above) simply ends a modal dialog, and hides a modeless dialog.
+

     static wxList closing;
 
     static wxList closing;
 

-    if (closing.Member(this)) return FALSE;   // no loops
-  
+    if (closing.Member(this))
+        return;   // no loops
+

     closing.Append(this);
 
     wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     cancelEvent.SetEventObject( this );
     GetEventHandler()->ProcessEvent(cancelEvent);
     closing.DeleteObject(this);
     closing.Append(this);
 
     wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     cancelEvent.SetEventObject( this );
     GetEventHandler()->ProcessEvent(cancelEvent);
     closing.DeleteObject(this);

-  
-    return FALSE;

 }
 
 bool wxDialog::Destroy()
 }
 
 bool wxDialog::Destroy()


@@ -208,89 +256,52 @@ bool wxDialog::Destroy()
     return TRUE;
 }
 
     return TRUE;
 }
 

-void wxDialog::OnCloseWindow( wxCloseEvent& event )
-{
-    if (GetEventHandler()->OnClose() || event.GetForce())
-    {
-        this->Destroy();
-    }
-}
-
-void wxDialog::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )
-{
-    // due to a bug in gtk, x,y are always 0
-    // m_x = x;
-    // m_y = y;
-
-    if ((m_height == height) && (m_width == width) &&
-        (m_sizeSet)) return;
-    if (!m_wxwindow) return;
-  
-    m_width = width;
-    m_height = height;
-  
-    if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
-    if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;
-    if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_minWidth;
-    if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_minHeight;
-
-    gtk_widget_set_usize( m_widget, m_width, m_height );
-
-    m_sizeSet = TRUE;
-    
-    wxSizeEvent event( wxSize(m_width,m_height), GetId() );
-    event.SetEventObject( this );
-    GetEventHandler()->ProcessEvent( event );
-}
-

 void wxDialog::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
 void wxDialog::OnSize( wxSizeEvent &WXUNUSED(event) )
 {

-    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-  
+    wxASSERT_MSG( (m_widget != NULL), "invalid dialog" );
+

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

-    else 
+    else

     {
     {

-        // no child: go out !
-        if (!GetChildren()->First()) return;
-      
-        // do we have exactly one child?
+        /* no child: go out ! */
+        if (!GetChildren().First()) return;
+
+        /* do we have exactly one child? */

         wxWindow *child = (wxWindow *) NULL;
         wxWindow *child = (wxWindow *) NULL;

-        for(wxNode *node = GetChildren()->First(); node; node = node->Next())
+        for(wxNode *node = GetChildren().First(); node; node = node->Next())

         {
             wxWindow *win = (wxWindow *)node->Data();
         {
             wxWindow *win = (wxWindow *)node->Data();

-            if (!IS_KIND_OF(win,wxFrame) && !IS_KIND_OF(win,wxDialog))
+            if (!wxIS_KIND_OF(win,wxFrame) && !wxIS_KIND_OF(win,wxDialog))

             {
             {

-               // it's the second one: do nothing
+                /* it's the second one: do nothing */

                 if (child) return;
                 child = win;
             }
         }
 
                 if (child) return;
                 child = win;
             }
         }
 

-        // yes: set it's size to fill all the frame
+        /* yes: set it's size to fill all the frame */

         int client_x, client_y;
         GetClientSize( &client_x, &client_y );
         child->SetSize( 1, 1, client_x-2, client_y);
     }
 }
 
         int client_x, client_y;
         GetClientSize( &client_x, &client_y );
         child->SetSize( 1, 1, client_x-2, client_y);
     }
 }
 

-void wxDialog::SetSize( int x, int y, int width, int height, int sizeFlags )
+void wxDialog::DoSetSize( int x, int y, int width, int height, int sizeFlags )

 {
 {

-    wxASSERT_MSG( (m_widget != NULL), "invalid window" );
-  
-    // Don't do anything for children of wxMDIChildFrame
-    if (!m_wxwindow) return;
+    wxASSERT_MSG( (m_widget != NULL), "invalid dialog" );
+    wxASSERT_MSG( (m_wxwindow != NULL), "invalid dialog" );

 
 

-    if (m_resizing) return; // I don't like recursions
+    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;
     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 (x != -1) m_x = x;
     if ((sizeFlags & wxSIZE_USE_EXISTING) == wxSIZE_USE_EXISTING)
     {
         if (x != -1) m_x = x;


@@ -315,61 +326,96 @@ void wxDialog::SetSize( int x, int y, int width, int height, int sizeFlags )
     {
        if (height == -1) m_height = 26;
     }
     {
        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;
     if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
     if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;

-    if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_minWidth;
-    if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_minHeight;
+    if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth;
+    if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight;

 
     if ((m_x != -1) || (m_y != -1))
     {
 
     if ((m_x != -1) || (m_y != -1))
     {

-        if ((m_x != old_x) || (m_y != old_y)) 
+        if ((m_x != old_x) || (m_y != old_y))
+       {
+            /* m_sizeSet = FALSE; */

             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))
     {
     if ((m_width != old_width) || (m_height != old_height))
     {

-        gtk_widget_set_usize( m_widget, m_width, m_height );
+        m_sizeSet = FALSE;

     }
     }

-  
-    m_sizeSet = TRUE;
-
-    wxSizeEvent event( wxSize(m_width,m_height), GetId() );
-    event.SetEventObject( this );
-    GetEventHandler()->ProcessEvent( event );

 
     m_resizing = FALSE;
 }
 
 
     m_resizing = FALSE;
 }
 

-void wxDialog::SetSize( int width, int height )
+void wxDialog::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )

 {
 {

-    SetSize( -1, -1, width, height, wxSIZE_USE_EXISTING );
+    // due to a bug in gtk, x,y are always 0
+    // m_x = x;
+    // m_y = y;
+
+    if ((m_height == height) && (m_width == width) && (m_sizeSet)) return;
+    if (!m_wxwindow) return;
+
+    m_width = width;
+    m_height = height;
+
+    if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
+    if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;
+    if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth;
+    if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight;
+
+    /* we actually set the size of a frame here and no-where else */
+    gtk_widget_set_usize( m_widget, m_width, m_height );
+
+    m_sizeSet = TRUE;
+
+    wxSizeEvent event( wxSize(m_width,m_height), GetId() );
+    event.SetEventObject( this );
+    GetEventHandler()->ProcessEvent( event );

 }
 
 void wxDialog::Centre( int direction )
 {
 }
 
 void wxDialog::Centre( int direction )
 {

-    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-  
+    wxASSERT_MSG( (m_widget != NULL), "invalid dialog" );
+

     int x = 0;
     int y = 0;
     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;
-  
+
+    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 );
 }
 
     Move( x, y );
 }
 

+void wxDialog::OnInternalIdle()
+{
+    if (!m_sizeSet)
+        GtkOnSize( m_x, m_y, m_width, m_height );
+}
+

 bool wxDialog::Show( bool show )
 {
     if (!show && IsModal())
     {
 bool wxDialog::Show( bool show )
 {
     if (!show && IsModal())
     {

-      EndModal( wxID_CANCEL );
+        EndModal( wxID_CANCEL );
+    }
+
+    if (show && !m_sizeSet)
+    {
+        /* by calling GtkOnSize here, we don't have to call
+           either after showing the frame, which would entail
+           much ugly flicker nor from within the size_allocate
+           handler, because GTK 1.1.X forbids that. */
+
+        GtkOnSize( m_x, m_y, m_width, m_height );

     }
 
     wxWindow::Show( show );
     }
 
     wxWindow::Show( show );

-  
+

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

-  
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -398,30 +444,30 @@ int wxDialog::ShowModal()
     }
 
     Show( TRUE );
     }
 
     Show( TRUE );

-  
+

     m_modalShowing = TRUE;
     m_modalShowing = TRUE;

-  
+

     gtk_grab_add( m_widget );
     gtk_main();
     gtk_grab_remove( m_widget );
     gtk_grab_add( m_widget );
     gtk_main();
     gtk_grab_remove( m_widget );

-  
+

     return GetReturnCode();
 }
 
 void wxDialog::EndModal( int retCode )
 {
     SetReturnCode( retCode );
     return GetReturnCode();
 }
 
 void wxDialog::EndModal( int retCode )
 {
     SetReturnCode( retCode );

-  
+

     if (!IsModal())
     {
         wxFAIL_MSG( "wxDialog:EndModal called twice" );
         return;
     }
     if (!IsModal())
     {
         wxFAIL_MSG( "wxDialog:EndModal called twice" );
         return;
     }

-  
+

     m_modalShowing = FALSE;
     m_modalShowing = FALSE;

-  
+

     gtk_main_quit();
     gtk_main_quit();

-  
+

     Show( FALSE );
 }
 
     Show( FALSE );
 }
 


@@ -434,10 +480,10 @@ void wxDialog::SetIcon( const wxIcon &icon )
 {
     m_icon = icon;
     if (!icon.Ok()) return;
 {
     m_icon = icon;
     if (!icon.Ok()) 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();

-  
+

     gdk_window_set_icon( m_widget->window, (GdkWindow *) NULL, icon.GetPixmap(), bm );
 }
     gdk_window_set_icon( m_widget->window, (GdkWindow *) NULL, icon.GetPixmap(), bm );
 }