Implement some base class virtuals to avoid errors related to this not

being a true wxDialog

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/msgdlg.h b/include/wx/gtk/msgdlg.h
index ddc15961ceac2d17a3d287b2b130a0e3c3071726..7ca2daea90ed5e0d94c2616499fd970e2e27a302 100644 (file)
--- a/include/wx/gtk/msgdlg.h
+++ b/include/wx/gtk/msgdlg.h
@@ -33,6 +33,15 @@ public:
                     const wxPoint& pos = wxDefaultPosition);
 
     int ShowModal();
+    virtual bool Show( bool show = true ) { return false; };
+
+protected:
+    // implement some base class methods to do nothing to avoid asserts and
+    // GTK warnings, since this is not a real wxDialog.
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO) {}
+    virtual void DoMoveWindow(int x, int y, int width, int height) {}
 
 private:
     wxString m_caption;

diff --git a/include/wx/gtk1/msgdlg.h b/include/wx/gtk1/msgdlg.h
index ddc15961ceac2d17a3d287b2b130a0e3c3071726..7ca2daea90ed5e0d94c2616499fd970e2e27a302 100644 (file)
--- a/include/wx/gtk1/msgdlg.h
+++ b/include/wx/gtk1/msgdlg.h
@@ -33,6 +33,15 @@ public:
                     const wxPoint& pos = wxDefaultPosition);
 
     int ShowModal();
+    virtual bool Show( bool show = true ) { return false; };
+
+protected:
+    // implement some base class methods to do nothing to avoid asserts and
+    // GTK warnings, since this is not a real wxDialog.
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO) {}
+    virtual void DoMoveWindow(int x, int y, int width, int height) {}
 
 private:
     wxString m_caption;

diff --git a/src/gtk/msgdlg.cpp b/src/gtk/msgdlg.cpp
index 610b4ec11ad84996a08fda0bbe30392557ea3cca..97ce07c6166d9c1b14d82e8b47eb943dd312c5c4 100644 (file)
--- a/src/gtk/msgdlg.cpp
+++ b/src/gtk/msgdlg.cpp
@@ -40,11 +40,7 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
     m_message = message;
     m_dialogStyle = style;
     m_parent = wxGetTopLevelParent(parent);
-}
 
-int wxMessageDialog::ShowModal()
-{
-    GtkWidget *dlg;
     GtkMessageType type = GTK_MESSAGE_ERROR;
     GtkButtonsType buttons = GTK_BUTTONS_OK;
 
@@ -75,27 +71,31 @@ int wxMessageDialog::ShowModal()
         type = m_dialogStyle & wxYES ? GTK_MESSAGE_QUESTION : GTK_MESSAGE_INFO;
     }
 
-    dlg = gtk_message_dialog_new(m_parent ?
-                                    GTK_WINDOW(m_parent->m_widget) : NULL,
-                                 GTK_DIALOG_MODAL,
-                                 type, buttons,
-                                 "%s", (const char*)wxGTK_CONV(m_message));
+    m_widget = gtk_message_dialog_new(m_parent ?
+                                          GTK_WINDOW(m_parent->m_widget) : NULL,
+                                      GTK_DIALOG_MODAL,
+                                      type, buttons,
+                                      "%s", (const char*)wxGTK_CONV(m_message));
     if (m_caption != wxMessageBoxCaptionStr)
-        gtk_window_set_title(GTK_WINDOW(dlg), wxGTK_CONV(m_caption));
+        gtk_window_set_title(GTK_WINDOW(m_widget), wxGTK_CONV(m_caption));
 
     if (m_dialogStyle & wxYES_NO)
     {
         if (m_dialogStyle & wxCANCEL)
-            gtk_dialog_add_button(GTK_DIALOG(dlg), GTK_STOCK_CANCEL,
+            gtk_dialog_add_button(GTK_DIALOG(m_widget), GTK_STOCK_CANCEL,
                                   GTK_RESPONSE_CANCEL);
         if (m_dialogStyle & wxNO_DEFAULT)
-            gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_NO);
+            gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_NO);
         else
-            gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_YES);
+            gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_YES);
     }
-
-    gint result = gtk_dialog_run(GTK_DIALOG(dlg));
-    gtk_widget_destroy(dlg);
+}
+ 
+int wxMessageDialog::ShowModal()
+{
+    gint result = gtk_dialog_run(GTK_DIALOG(m_widget));
+    gtk_widget_destroy(m_widget);
+    m_widget = NULL;
 
     switch (result)
     {
@@ -114,5 +114,6 @@ int wxMessageDialog::ShowModal()
     }
 }
 
+
 #endif // wxUSE_MSGDLG && defined(__WXGTK20__)
 

diff --git a/src/gtk1/msgdlg.cpp b/src/gtk1/msgdlg.cpp
index 610b4ec11ad84996a08fda0bbe30392557ea3cca..97ce07c6166d9c1b14d82e8b47eb943dd312c5c4 100644 (file)
--- a/src/gtk1/msgdlg.cpp
+++ b/src/gtk1/msgdlg.cpp
@@ -40,11 +40,7 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
     m_message = message;
     m_dialogStyle = style;
     m_parent = wxGetTopLevelParent(parent);
-}
 
-int wxMessageDialog::ShowModal()
-{
-    GtkWidget *dlg;
     GtkMessageType type = GTK_MESSAGE_ERROR;
     GtkButtonsType buttons = GTK_BUTTONS_OK;
 
@@ -75,27 +71,31 @@ int wxMessageDialog::ShowModal()
         type = m_dialogStyle & wxYES ? GTK_MESSAGE_QUESTION : GTK_MESSAGE_INFO;
     }
 
-    dlg = gtk_message_dialog_new(m_parent ?
-                                    GTK_WINDOW(m_parent->m_widget) : NULL,
-                                 GTK_DIALOG_MODAL,
-                                 type, buttons,
-                                 "%s", (const char*)wxGTK_CONV(m_message));
+    m_widget = gtk_message_dialog_new(m_parent ?
+                                          GTK_WINDOW(m_parent->m_widget) : NULL,
+                                      GTK_DIALOG_MODAL,
+                                      type, buttons,
+                                      "%s", (const char*)wxGTK_CONV(m_message));
     if (m_caption != wxMessageBoxCaptionStr)
-        gtk_window_set_title(GTK_WINDOW(dlg), wxGTK_CONV(m_caption));
+        gtk_window_set_title(GTK_WINDOW(m_widget), wxGTK_CONV(m_caption));
 
     if (m_dialogStyle & wxYES_NO)
     {
         if (m_dialogStyle & wxCANCEL)
-            gtk_dialog_add_button(GTK_DIALOG(dlg), GTK_STOCK_CANCEL,
+            gtk_dialog_add_button(GTK_DIALOG(m_widget), GTK_STOCK_CANCEL,
                                   GTK_RESPONSE_CANCEL);
         if (m_dialogStyle & wxNO_DEFAULT)
-            gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_NO);
+            gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_NO);
         else
-            gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_YES);
+            gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_YES);
     }
-
-    gint result = gtk_dialog_run(GTK_DIALOG(dlg));
-    gtk_widget_destroy(dlg);
+}
+ 
+int wxMessageDialog::ShowModal()
+{
+    gint result = gtk_dialog_run(GTK_DIALOG(m_widget));
+    gtk_widget_destroy(m_widget);
+    m_widget = NULL;
 
     switch (result)
     {
@@ -114,5 +114,6 @@ int wxMessageDialog::ShowModal()
     }
 }
 
+
 #endif // wxUSE_MSGDLG && defined(__WXGTK20__)