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

Rename *_filedialog_* to *_dirdialog_* to ensure there is no clashing with filedlg.cpp implementation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mart Raudsepp
2006-05-15 14:22:08 +00:00
parent 3fe39b0ce3
commit f1e1e6952e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gtk/dirdlg.cpp
View File

@@ -48,7 +48,7 @@ extern void wxapp_install_idle_handler();
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
extern "C" { extern "C" {
static void gtk_filedialog_ok_callback(GtkWidget *widget, wxDirDialogGTK *dialog) static void gtk_dirdialog_ok_callback(GtkWidget *widget, wxDirDialogGTK *dialog)
{ {
gchar* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)); gchar* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
@@ -69,7 +69,7 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxDirDialogGTK *dialog
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
extern "C" { extern "C" {
static void gtk_filedialog_cancel_callback(GtkWidget *WXUNUSED(w), static void gtk_dirdialog_cancel_callback(GtkWidget *WXUNUSED(w),
wxDirDialogGTK *dialog) wxDirDialogGTK *dialog)
{ {
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
@@ -79,19 +79,19 @@ static void gtk_filedialog_cancel_callback(GtkWidget *WXUNUSED(w),
} }
extern "C" { extern "C" {
static void gtk_filedialog_response_callback(GtkWidget *w, static void gtk_dirdialog_response_callback(GtkWidget *w,
gint response, gint response,
wxDirDialogGTK *dialog) wxDirDialogGTK *dialog)
{ {
wxapp_install_idle_handler(); wxapp_install_idle_handler();
if (response == GTK_RESPONSE_ACCEPT) if (response == GTK_RESPONSE_ACCEPT)
gtk_filedialog_ok_callback(w, dialog); gtk_dirdialog_ok_callback(w, dialog);
else if (response == GTK_RESPONSE_CANCEL) else if (response == GTK_RESPONSE_CANCEL)
gtk_filedialog_cancel_callback(w, dialog); gtk_dirdialog_cancel_callback(w, dialog);
else // "delete" else // "delete"
{ {
gtk_filedialog_cancel_callback(w, dialog); gtk_dirdialog_cancel_callback(w, dialog);
dialog->m_destroyed_by_delete = true; dialog->m_destroyed_by_delete = true;
} }
} }
@@ -123,7 +123,7 @@ wxDirDialogGTK::wxDirDialogGTK(wxWindow* parent, const wxString& title,
if (!PreCreation(parent, pos, wxDefaultSize) || if (!PreCreation(parent, pos, wxDefaultSize) ||
!CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style, !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style,
wxDefaultValidator, wxT("filedialog"))) wxDefaultValidator, wxT("dirdialog")))
{ {
wxFAIL_MSG( wxT("wxDirDialogGTK creation failed") ); wxFAIL_MSG( wxT("wxDirDialogGTK creation failed") );
return; return;
@@ -156,7 +156,7 @@ wxDirDialogGTK::wxDirDialogGTK(wxWindow* parent, const wxString& title,
// gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(m_widget), true); // gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(m_widget), true);
g_signal_connect (m_widget, "response", g_signal_connect (m_widget, "response",
G_CALLBACK (gtk_filedialog_response_callback), this); G_CALLBACK (gtk_dirdialog_response_callback), this);
if ( !defaultPath.empty() ) if ( !defaultPath.empty() )
gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(m_widget), gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(m_widget),