Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
being a true wxDialog


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-05-02 01:55:29 +00:00
parent 6f28211af2
commit b2ce5e1b27
4 changed files with 52 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/gtk/msgdlg.h
View File

@@ -33,6 +33,15 @@ public:
const wxPoint& pos = wxDefaultPosition); const wxPoint& pos = wxDefaultPosition);
int ShowModal(); 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: private:
wxString m_caption; wxString m_caption;

9
include/wx/gtk1/msgdlg.h
View File

@@ -33,6 +33,15 @@ public:
const wxPoint& pos = wxDefaultPosition); const wxPoint& pos = wxDefaultPosition);
int ShowModal(); 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: private:
wxString m_caption; wxString m_caption;

23
src/gtk/msgdlg.cpp
View File

@@ -40,11 +40,7 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
m_message = message; m_message = message;
m_dialogStyle = style; m_dialogStyle = style;
m_parent = wxGetTopLevelParent(parent); m_parent = wxGetTopLevelParent(parent);
}
int wxMessageDialog::ShowModal()
{
GtkWidget *dlg;
GtkMessageType type = GTK_MESSAGE_ERROR; GtkMessageType type = GTK_MESSAGE_ERROR;
GtkButtonsType buttons = GTK_BUTTONS_OK; GtkButtonsType buttons = GTK_BUTTONS_OK;
@@ -75,27 +71,31 @@ int wxMessageDialog::ShowModal()
type = m_dialogStyle & wxYES ? GTK_MESSAGE_QUESTION : GTK_MESSAGE_INFO; type = m_dialogStyle & wxYES ? GTK_MESSAGE_QUESTION : GTK_MESSAGE_INFO;
} }
dlg = gtk_message_dialog_new(m_parent ? m_widget = gtk_message_dialog_new(m_parent ?
GTK_WINDOW(m_parent->m_widget) : NULL, GTK_WINDOW(m_parent->m_widget) : NULL,
GTK_DIALOG_MODAL, GTK_DIALOG_MODAL,
type, buttons, type, buttons,
"%s", (const char*)wxGTK_CONV(m_message)); "%s", (const char*)wxGTK_CONV(m_message));
if (m_caption != wxMessageBoxCaptionStr) 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 & wxYES_NO)
{ {
if (m_dialogStyle & wxCANCEL) 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); GTK_RESPONSE_CANCEL);
if (m_dialogStyle & wxNO_DEFAULT) 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 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)); int wxMessageDialog::ShowModal()
gtk_widget_destroy(dlg); {
gint result = gtk_dialog_run(GTK_DIALOG(m_widget));
gtk_widget_destroy(m_widget);
m_widget = NULL;
switch (result) switch (result)
{ {
@@ -114,5 +114,6 @@ int wxMessageDialog::ShowModal()
} }
} }
#endif // wxUSE_MSGDLG && defined(__WXGTK20__) #endif // wxUSE_MSGDLG && defined(__WXGTK20__)

23
src/gtk1/msgdlg.cpp
View File

@@ -40,11 +40,7 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
m_message = message; m_message = message;
m_dialogStyle = style; m_dialogStyle = style;
m_parent = wxGetTopLevelParent(parent); m_parent = wxGetTopLevelParent(parent);
}
int wxMessageDialog::ShowModal()
{
GtkWidget *dlg;
GtkMessageType type = GTK_MESSAGE_ERROR; GtkMessageType type = GTK_MESSAGE_ERROR;
GtkButtonsType buttons = GTK_BUTTONS_OK; GtkButtonsType buttons = GTK_BUTTONS_OK;
@@ -75,27 +71,31 @@ int wxMessageDialog::ShowModal()
type = m_dialogStyle & wxYES ? GTK_MESSAGE_QUESTION : GTK_MESSAGE_INFO; type = m_dialogStyle & wxYES ? GTK_MESSAGE_QUESTION : GTK_MESSAGE_INFO;
} }
dlg = gtk_message_dialog_new(m_parent ? m_widget = gtk_message_dialog_new(m_parent ?
GTK_WINDOW(m_parent->m_widget) : NULL, GTK_WINDOW(m_parent->m_widget) : NULL,
GTK_DIALOG_MODAL, GTK_DIALOG_MODAL,
type, buttons, type, buttons,
"%s", (const char*)wxGTK_CONV(m_message)); "%s", (const char*)wxGTK_CONV(m_message));
if (m_caption != wxMessageBoxCaptionStr) 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 & wxYES_NO)
{ {
if (m_dialogStyle & wxCANCEL) 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); GTK_RESPONSE_CANCEL);
if (m_dialogStyle & wxNO_DEFAULT) 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 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)); int wxMessageDialog::ShowModal()
gtk_widget_destroy(dlg); {
gint result = gtk_dialog_run(GTK_DIALOG(m_widget));
gtk_widget_destroy(m_widget);
m_widget = NULL;
switch (result) switch (result)
{ {
@@ -114,5 +114,6 @@ int wxMessageDialog::ShowModal()
} }
} }
#endif // wxUSE_MSGDLG && defined(__WXGTK20__) #endif // wxUSE_MSGDLG && defined(__WXGTK20__)