From: Robert Roebling Date: Wed, 3 Feb 1999 14:28:55 +0000 (+0000) Subject: Trying to repair what CVS can do to source code X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2748d25157097ce4126afcf5052315b368bfbc44?ds=sidebyside Trying to repair what CVS can do to source code git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/gtk/filedlg.h b/include/wx/gtk/filedlg.h index c5d4ae64b1..ad07d0736e 100644 --- a/include/wx/gtk/filedlg.h +++ b/include/wx/gtk/filedlg.h @@ -54,11 +54,9 @@ public: wxString GetWildcard() const { return m_wildCard; } long GetStyle() const { return m_dialogStyle; } int GetFilterIndex() const { return m_filterIndex ; } - - int ShowModal(); - - protected: - + +protected: + wxString m_message; long m_dialogStyle; wxWindow * m_parent; diff --git a/include/wx/gtk1/filedlg.h b/include/wx/gtk1/filedlg.h index c5d4ae64b1..ad07d0736e 100644 --- a/include/wx/gtk1/filedlg.h +++ b/include/wx/gtk1/filedlg.h @@ -54,11 +54,9 @@ public: wxString GetWildcard() const { return m_wildCard; } long GetStyle() const { return m_dialogStyle; } int GetFilterIndex() const { return m_filterIndex ; } - - int ShowModal(); - - protected: - + +protected: + wxString m_message; long m_dialogStyle; wxWindow * m_parent; diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp index 2fe910ca8b..12cc3c414c 100644 --- a/samples/controls/controls.cpp +++ b/samples/controls/controls.cpp @@ -444,16 +444,13 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) new MyTextCtrl( panel, -1, "This one is with wxTE_PROCESS_TAB style.", wxPoint(10,120), wxSize(320,70), wxTE_MULTILINE | wxTE_PROCESS_TAB); - (void)new wxStaticBox( panel, -1, "&Move cursor to the end of:", - wxPoint(345, 0), wxSize(160, 100) ); - (void)new wxButton(panel, ID_MOVE_END_ENTRY, "Text &entry", - wxPoint(370, 20), wxSize(110, 30)); - (void)new wxButton(panel, ID_MOVE_END_ZONE, "Text &zone", - wxPoint(370, 60), wxSize(110, 30)); - (void)new wxStaticBox( panel, -1, "wx&Clipboard", wxPoint(338,120), wxSize(160,100) ); - (void)new wxButton( panel, ID_COPY_TEXT, "C&opy line 1", wxPoint(362,140), wxSize(110,30) ); - (void)new wxButton( panel, ID_PASTE_TEXT, "&Paste text", wxPoint(362,180), wxSize(110,30) ); - m_notebook->AddPage(panel, "wxTextCtrl" , FALSE, Image_Text); + (void)new wxStaticBox( panel, -1, "&Move cursor to the end of:", wxPoint(345, 0), wxSize(160, 100) ); + (void)new wxButton( panel, ID_MOVE_END_ENTRY, "Text &entry", wxPoint(370, 20), wxSize(110, 30) ); + (void)new wxButton( panel, ID_MOVE_END_ZONE, "Text &zone", wxPoint(370, 60), wxSize(110, 30) ); + (void)new wxStaticBox( panel, -1, "wx&Clipboard", wxPoint(345,110), wxSize(160,100) ); + (void)new wxButton( panel, ID_COPY_TEXT, "C&opy line 1", wxPoint(375,130), wxSize(110,30) ); + (void)new wxButton( panel, ID_PASTE_TEXT, "&Paste text", wxPoint(375,170), wxSize(110,30) ); + m_notebook->AddPage( panel, "wxTextCtrl" , FALSE, Image_Text ); wxString choices2[] = { diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp index 4d314208c5..88fb8defb7 100644 --- a/src/gtk/filedlg.cpp +++ b/src/gtk/filedlg.cpp @@ -42,32 +42,31 @@ bool gtk_filedialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUN //----------------------------------------------------------------------------- static -void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), gpointer data ) +void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFileDialog *dialog ) { - wxFileDialog *dialog = (wxFileDialog*)data; - wxCommandEvent event(wxEVT_NULL); - int style; + int style = dialog->GetStyle(); - style = dialog->GetStyle(); - - if( (style & wxSAVE ) && ( style&wxOVERWRITE_PROMPT ) ) + if ((style&wxSAVE)&&(style&wxOVERWRITE_PROMPT)) { char *filename = gtk_file_selection_get_filename( - GTK_FILE_SELECTION(dialog->m_widget) - ); + GTK_FILE_SELECTION(dialog->m_widget) ); - if(wxFileExists( filename )) + if (wxFileExists( filename )) { wxString msg; - msg.Printf(_("File '%s' already exists, do you really want to " + msg.Printf( _("File '%s' already exists, do you really want to " "overwrite it?"), filename); - if( wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES) + if (wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES) return; } } - dialog->OnOK( event ); + dialog->SetPath( gtk_file_selection_get_filename( GTK_FILE_SELECTION(dialog->m_widget) ) ); + + wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_OK); + event.SetEventObject( dialog ); + dialog->GetEventHandler()->ProcessEvent( event ); } //----------------------------------------------------------------------------- @@ -77,9 +76,9 @@ void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), gpointer data ) static void gtk_filedialog_cancel_callback( GtkWidget *WXUNUSED(widget), gpointer data ) { - wxFileDialog *dialog = (wxFileDialog*)data; - wxCommandEvent event(wxEVT_NULL); - dialog->OnCancel( event ); + wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL); + event.SetEventObject( dialog ); + dialog->GetEventHandler()->ProcessEvent( event ); } //----------------------------------------------------------------------------- @@ -126,22 +125,8 @@ wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message, gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event", GTK_SIGNAL_FUNC(gtk_filedialog_delete_callback), (gpointer)this ); - } -int wxFileDialog::ShowModal(void) -{ - int ret = wxDialog::ShowModal(); - - if (ret == wxID_OK) - { - m_fileName = gtk_file_selection_get_filename( GTK_FILE_SELECTION(m_widget) ); - m_path = gtk_file_selection_get_filename( GTK_FILE_SELECTION(m_widget) ); - } - return ret; -} - - wxString wxFileSelector( const char *title, const char *defaultDir, const char *defaultFileName, const char *defaultExtension, const char *filter, int flags, diff --git a/src/gtk1/filedlg.cpp b/src/gtk1/filedlg.cpp index 4d314208c5..88fb8defb7 100644 --- a/src/gtk1/filedlg.cpp +++ b/src/gtk1/filedlg.cpp @@ -42,32 +42,31 @@ bool gtk_filedialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUN //----------------------------------------------------------------------------- static -void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), gpointer data ) +void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFileDialog *dialog ) { - wxFileDialog *dialog = (wxFileDialog*)data; - wxCommandEvent event(wxEVT_NULL); - int style; + int style = dialog->GetStyle(); - style = dialog->GetStyle(); - - if( (style & wxSAVE ) && ( style&wxOVERWRITE_PROMPT ) ) + if ((style&wxSAVE)&&(style&wxOVERWRITE_PROMPT)) { char *filename = gtk_file_selection_get_filename( - GTK_FILE_SELECTION(dialog->m_widget) - ); + GTK_FILE_SELECTION(dialog->m_widget) ); - if(wxFileExists( filename )) + if (wxFileExists( filename )) { wxString msg; - msg.Printf(_("File '%s' already exists, do you really want to " + msg.Printf( _("File '%s' already exists, do you really want to " "overwrite it?"), filename); - if( wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES) + if (wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES) return; } } - dialog->OnOK( event ); + dialog->SetPath( gtk_file_selection_get_filename( GTK_FILE_SELECTION(dialog->m_widget) ) ); + + wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_OK); + event.SetEventObject( dialog ); + dialog->GetEventHandler()->ProcessEvent( event ); } //----------------------------------------------------------------------------- @@ -77,9 +76,9 @@ void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), gpointer data ) static void gtk_filedialog_cancel_callback( GtkWidget *WXUNUSED(widget), gpointer data ) { - wxFileDialog *dialog = (wxFileDialog*)data; - wxCommandEvent event(wxEVT_NULL); - dialog->OnCancel( event ); + wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL); + event.SetEventObject( dialog ); + dialog->GetEventHandler()->ProcessEvent( event ); } //----------------------------------------------------------------------------- @@ -126,22 +125,8 @@ wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message, gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event", GTK_SIGNAL_FUNC(gtk_filedialog_delete_callback), (gpointer)this ); - } -int wxFileDialog::ShowModal(void) -{ - int ret = wxDialog::ShowModal(); - - if (ret == wxID_OK) - { - m_fileName = gtk_file_selection_get_filename( GTK_FILE_SELECTION(m_widget) ); - m_path = gtk_file_selection_get_filename( GTK_FILE_SELECTION(m_widget) ); - } - return ret; -} - - wxString wxFileSelector( const char *title, const char *defaultDir, const char *defaultFileName, const char *defaultExtension, const char *filter, int flags,