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

Trying to repair what CVS can do to source code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-02-03 14:28:55 +00:00
parent 2fff5f0811
commit 2748d25157
5 changed files with 43 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/gtk/filedlg.h
View File

@@ -54,11 +54,9 @@ public:
wxString GetWildcard() const { return m_wildCard; } wxString GetWildcard() const { return m_wildCard; }
long GetStyle() const { return m_dialogStyle; } long GetStyle() const { return m_dialogStyle; }
int GetFilterIndex() const { return m_filterIndex ; } int GetFilterIndex() const { return m_filterIndex ; }
int ShowModal(); protected:
protected:
wxString m_message; wxString m_message;
long m_dialogStyle; long m_dialogStyle;
wxWindow * m_parent; wxWindow * m_parent;

8
include/wx/gtk1/filedlg.h
View File

@@ -54,11 +54,9 @@ public:
wxString GetWildcard() const { return m_wildCard; } wxString GetWildcard() const { return m_wildCard; }
long GetStyle() const { return m_dialogStyle; } long GetStyle() const { return m_dialogStyle; }
int GetFilterIndex() const { return m_filterIndex ; } int GetFilterIndex() const { return m_filterIndex ; }
int ShowModal(); protected:
protected:
wxString m_message; wxString m_message;
long m_dialogStyle; long m_dialogStyle;
wxWindow * m_parent; wxWindow * m_parent;

17
samples/controls/controls.cpp
View File

@@ -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.", new MyTextCtrl( panel, -1, "This one is with wxTE_PROCESS_TAB style.",
wxPoint(10,120), wxSize(320,70), wxTE_MULTILINE | wxTE_PROCESS_TAB); wxPoint(10,120), wxSize(320,70), wxTE_MULTILINE | wxTE_PROCESS_TAB);
(void)new wxStaticBox( panel, -1, "&Move cursor to the end of:", (void)new wxStaticBox( panel, -1, "&Move cursor to the end of:", wxPoint(345, 0), wxSize(160, 100) );
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_ENTRY, "Text &entry", (void)new wxButton( panel, ID_MOVE_END_ZONE, "Text &zone", wxPoint(370, 60), wxSize(110, 30) );
wxPoint(370, 20), wxSize(110, 30)); (void)new wxStaticBox( panel, -1, "wx&Clipboard", wxPoint(345,110), wxSize(160,100) );
(void)new wxButton(panel, ID_MOVE_END_ZONE, "Text &zone", (void)new wxButton( panel, ID_COPY_TEXT, "C&opy line 1", wxPoint(375,130), wxSize(110,30) );
wxPoint(370, 60), wxSize(110, 30)); (void)new wxButton( panel, ID_PASTE_TEXT, "&Paste text", wxPoint(375,170), wxSize(110,30) );
(void)new wxStaticBox( panel, -1, "wx&Clipboard", wxPoint(338,120), wxSize(160,100) ); m_notebook->AddPage( panel, "wxTextCtrl" , FALSE, Image_Text );
(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);
wxString choices2[] = wxString choices2[] =
{ {

45
src/gtk/filedlg.cpp
View File

@@ -42,32 +42,31 @@ bool gtk_filedialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUN
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static 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; int style = dialog->GetStyle();
wxCommandEvent event(wxEVT_NULL);
int style;
style = dialog->GetStyle(); if ((style&wxSAVE)&&(style&wxOVERWRITE_PROMPT))
if( (style & wxSAVE ) && ( style&wxOVERWRITE_PROMPT ) )
{ {
char *filename = gtk_file_selection_get_filename( 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; 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); "overwrite it?"), filename);
if( wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES) if (wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES)
return; 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 static
void gtk_filedialog_cancel_callback( GtkWidget *WXUNUSED(widget), gpointer data ) void gtk_filedialog_cancel_callback( GtkWidget *WXUNUSED(widget), gpointer data )
{ {
wxFileDialog *dialog = (wxFileDialog*)data; wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
wxCommandEvent event(wxEVT_NULL); event.SetEventObject( dialog );
dialog->OnCancel( event ); 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_connect( GTK_OBJECT(m_widget), "delete_event",
GTK_SIGNAL_FUNC(gtk_filedialog_delete_callback), (gpointer)this ); 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, wxString wxFileSelector( const char *title,
const char *defaultDir, const char *defaultFileName, const char *defaultDir, const char *defaultFileName,
const char *defaultExtension, const char *filter, int flags, const char *defaultExtension, const char *filter, int flags,

45
src/gtk1/filedlg.cpp
View File

@@ -42,32 +42,31 @@ bool gtk_filedialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUN
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static 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; int style = dialog->GetStyle();
wxCommandEvent event(wxEVT_NULL);
int style;
style = dialog->GetStyle(); if ((style&wxSAVE)&&(style&wxOVERWRITE_PROMPT))
if( (style & wxSAVE ) && ( style&wxOVERWRITE_PROMPT ) )
{ {
char *filename = gtk_file_selection_get_filename( 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; 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); "overwrite it?"), filename);
if( wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES) if (wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES)
return; 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 static
void gtk_filedialog_cancel_callback( GtkWidget *WXUNUSED(widget), gpointer data ) void gtk_filedialog_cancel_callback( GtkWidget *WXUNUSED(widget), gpointer data )
{ {
wxFileDialog *dialog = (wxFileDialog*)data; wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
wxCommandEvent event(wxEVT_NULL); event.SetEventObject( dialog );
dialog->OnCancel( event ); 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_connect( GTK_OBJECT(m_widget), "delete_event",
GTK_SIGNAL_FUNC(gtk_filedialog_delete_callback), (gpointer)this ); 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, wxString wxFileSelector( const char *title,
const char *defaultDir, const char *defaultFileName, const char *defaultDir, const char *defaultFileName,
const char *defaultExtension, const char *filter, int flags, const char *defaultExtension, const char *filter, int flags,