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

compilation warning removed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-02-02 12:07:25 +00:00
parent f2fc7f71ce
commit 0e1399b392
4 changed files with 100 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,39 +26,38 @@ extern const char *wxFileSelectorDefaultWildcardStr;
class wxFileDialog: public wxDialog class wxFileDialog: public wxDialog
{ {
DECLARE_DYNAMIC_CLASS(wxFileDialog)
DECLARE_DYNAMIC_CLASS(wxFileDialog) public:
wxFileDialog() { }
friend void gtk_filedialog_ok_callback( GtkWidget *widget, gpointer data ); wxFileDialog(wxWindow *parent,
const wxString& message = wxFileSelectorPromptStr,
const wxString& defaultDir = "",
const wxString& defaultFile = "",
const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
long style = 0,
const wxPoint& pos = wxDefaultPosition);
public: void SetMessage(const wxString& message) { m_message = message; }
void SetPath(const wxString& path) { m_path = path; }
void SetDirectory(const wxString& dir) { m_dir = dir; }
void SetFilename(const wxString& name) { m_fileName = name; }
void SetWildcard(const wxString& wildCard) { m_wildCard = wildCard; }
void SetStyle(long style) { m_dialogStyle = style; }
void SetFilterIndex(int filterIndex) { m_filterIndex = filterIndex; }
wxFileDialog() {}; wxString GetMessage() const { return m_message; }
wxString GetPath() const { return m_path; }
wxString GetDirectory() const { return m_dir; }
wxString GetFilename() const { return m_fileName; }
wxString GetWildcard() const { return m_wildCard; }
long GetStyle() const { return m_dialogStyle; }
int GetFilterIndex() const { return m_filterIndex ; }
wxFileDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr, int ShowModal();
const wxString& defaultDir = "", const wxString& defaultFile = "",
const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
long style = 0, const wxPoint& pos = wxDefaultPosition);
inline void SetMessage(const wxString& message) { m_message = message; } protected:
inline void SetPath(const wxString& path) { m_path = path; }
inline void SetDirectory(const wxString& dir) { m_dir = dir; }
inline void SetFilename(const wxString& name) { m_fileName = name; }
inline void SetWildcard(const wxString& wildCard) { m_wildCard = wildCard; }
inline void SetStyle(long style) { m_dialogStyle = style; }
inline void SetFilterIndex(int filterIndex) { m_filterIndex = filterIndex; }
inline wxString GetMessage(void) const { return m_message; }
inline wxString GetPath(void) const { return m_path; }
inline wxString GetDirectory(void) const { return m_dir; }
inline wxString GetFilename(void) const { return m_fileName; }
inline wxString GetWildcard(void) const { return m_wildCard; }
inline long GetStyle(void) const { return m_dialogStyle; }
inline int GetFilterIndex(void) const { return m_filterIndex ; }
int ShowModal(void);
protected:
wxString m_message; wxString m_message;
long m_dialogStyle; long m_dialogStyle;

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

@@ -26,39 +26,38 @@ extern const char *wxFileSelectorDefaultWildcardStr;
class wxFileDialog: public wxDialog class wxFileDialog: public wxDialog
{ {
DECLARE_DYNAMIC_CLASS(wxFileDialog)
DECLARE_DYNAMIC_CLASS(wxFileDialog) public:
wxFileDialog() { }
friend void gtk_filedialog_ok_callback( GtkWidget *widget, gpointer data ); wxFileDialog(wxWindow *parent,
const wxString& message = wxFileSelectorPromptStr,
const wxString& defaultDir = "",
const wxString& defaultFile = "",
const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
long style = 0,
const wxPoint& pos = wxDefaultPosition);
public: void SetMessage(const wxString& message) { m_message = message; }
void SetPath(const wxString& path) { m_path = path; }
void SetDirectory(const wxString& dir) { m_dir = dir; }
void SetFilename(const wxString& name) { m_fileName = name; }
void SetWildcard(const wxString& wildCard) { m_wildCard = wildCard; }
void SetStyle(long style) { m_dialogStyle = style; }
void SetFilterIndex(int filterIndex) { m_filterIndex = filterIndex; }
wxFileDialog() {}; wxString GetMessage() const { return m_message; }
wxString GetPath() const { return m_path; }
wxString GetDirectory() const { return m_dir; }
wxString GetFilename() const { return m_fileName; }
wxString GetWildcard() const { return m_wildCard; }
long GetStyle() const { return m_dialogStyle; }
int GetFilterIndex() const { return m_filterIndex ; }
wxFileDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr, int ShowModal();
const wxString& defaultDir = "", const wxString& defaultFile = "",
const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
long style = 0, const wxPoint& pos = wxDefaultPosition);
inline void SetMessage(const wxString& message) { m_message = message; } protected:
inline void SetPath(const wxString& path) { m_path = path; }
inline void SetDirectory(const wxString& dir) { m_dir = dir; }
inline void SetFilename(const wxString& name) { m_fileName = name; }
inline void SetWildcard(const wxString& wildCard) { m_wildCard = wildCard; }
inline void SetStyle(long style) { m_dialogStyle = style; }
inline void SetFilterIndex(int filterIndex) { m_filterIndex = filterIndex; }
inline wxString GetMessage(void) const { return m_message; }
inline wxString GetPath(void) const { return m_path; }
inline wxString GetDirectory(void) const { return m_dir; }
inline wxString GetFilename(void) const { return m_fileName; }
inline wxString GetWildcard(void) const { return m_wildCard; }
inline long GetStyle(void) const { return m_dialogStyle; }
inline int GetFilterIndex(void) const { return m_filterIndex ; }
int ShowModal(void);
protected:
wxString m_message; wxString m_message;
long m_dialogStyle; long m_dialogStyle;

21
src/gtk/filedlg.cpp
View File

@@ -50,14 +50,21 @@ void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), gpointer data )
style = dialog->GetStyle(); style = dialog->GetStyle();
if((style&wxSAVE)&&(style&wxOVERWRITE_PROMPT)) if( (style & wxSAVE ) && ( style&wxOVERWRITE_PROMPT ) )
{ {
if(wxFileExists(gtk_file_selection_get_filename(GTK_FILE_SELECTION(dialog->m_widget) ))) char *filename = gtk_file_selection_get_filename(
{ GTK_FILE_SELECTION(dialog->m_widget)
if(wxMessageBox(_("File exists. Overwrite?"), );
_("Confirm"), wxYES_NO) != wxYES)
return; if(wxFileExists( filename ))
} {
wxString msg;
msg.Printf(_("File '%s' already exists, do you really want to "
"overwrite it?"), filename);
if( wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES)
return;
}
} }
dialog->OnOK( event ); dialog->OnOK( event );

21
src/gtk1/filedlg.cpp
View File

@@ -50,14 +50,21 @@ void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), gpointer data )
style = dialog->GetStyle(); style = dialog->GetStyle();
if((style&wxSAVE)&&(style&wxOVERWRITE_PROMPT)) if( (style & wxSAVE ) && ( style&wxOVERWRITE_PROMPT ) )
{ {
if(wxFileExists(gtk_file_selection_get_filename(GTK_FILE_SELECTION(dialog->m_widget) ))) char *filename = gtk_file_selection_get_filename(
{ GTK_FILE_SELECTION(dialog->m_widget)
if(wxMessageBox(_("File exists. Overwrite?"), );
_("Confirm"), wxYES_NO) != wxYES)
return; if(wxFileExists( filename ))
} {
wxString msg;
msg.Printf(_("File '%s' already exists, do you really want to "
"overwrite it?"), filename);
if( wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES)
return;
}
} }
dialog->OnOK( event ); dialog->OnOK( event );