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

Don't use native file/dir picker buttons when using an associated text control

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2009-02-12 21:11:09 +00:00
parent 723b3994e0
commit 77d827708d
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gtk/filepicker.cpp
View File

@@ -43,9 +43,9 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
{ {
// we can't use the native button for wxFLP_SAVE pickers as it can only // we can't use the native button for wxFLP_SAVE pickers as it can only
// open existing files and there is no way to create a new file using it // open existing files and there is no way to create a new file using it
if ( !(style & wxFLP_SAVE) && !gtk_check_version(2,6,0) ) if ( !(style & wxFLP_SAVE) && !(style & wxFLP_USE_TEXTCTRL) && !gtk_check_version(2,6,0) )
{ {
// VERY IMPORTANT: this code is identic to relative code in wxDirButton; // VERY IMPORTANT: this code is identical to relative code in wxDirButton;
// if you find a problem here, fix it also in wxDirButton ! // if you find a problem here, fix it also in wxDirButton !
if (!PreCreation( parent, pos, size ) || if (!PreCreation( parent, pos, size ) ||
@@ -65,7 +65,7 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
m_wildcard = wildcard; m_wildcard = wildcard;
if ((m_dialog = CreateDialog()) == NULL) if ((m_dialog = CreateDialog()) == NULL)
return false; return false;
// little trick used to avoid problems when there are other GTK windows 'grabbed': // little trick used to avoid problems when there are other GTK windows 'grabbed':
// GtkFileChooserDialog won't be responsive to user events if there is another // GtkFileChooserDialog won't be responsive to user events if there is another
// window which called gtk_grab_add (and this happens if e.g. a wxDialog is running // window which called gtk_grab_add (and this happens if e.g. a wxDialog is running
@@ -78,9 +78,9 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
g_signal_connect(m_dialog->m_widget, "show", G_CALLBACK(gtk_grab_add), NULL); g_signal_connect(m_dialog->m_widget, "show", G_CALLBACK(gtk_grab_add), NULL);
g_signal_connect(m_dialog->m_widget, "hide", G_CALLBACK(gtk_grab_remove), NULL); g_signal_connect(m_dialog->m_widget, "hide", G_CALLBACK(gtk_grab_remove), NULL);
// NOTE: we deliberately ignore the given label as GtkFileChooserButton
// use as label the currently selected file // use as label the currently selected file
m_widget = gtk_file_chooser_button_new_with_dialog( m_dialog->m_widget ); m_widget = gtk_file_chooser_button_new_with_dialog( m_dialog->m_widget );
g_object_ref(m_widget); g_object_ref(m_widget);
gtk_widget_show(m_widget); gtk_widget_show(m_widget);
@@ -124,6 +124,7 @@ void wxFileButton::OnDialogOK(wxCommandEvent& ev)
void wxFileButton::SetPath(const wxString &str) void wxFileButton::SetPath(const wxString &str)
{ {
m_path = str; m_path = str;
if (m_dialog) if (m_dialog)
UpdateDialogPath(m_dialog); UpdateDialogPath(m_dialog);
} }
@@ -157,7 +158,7 @@ static void gtk_dirbutton_currentfolderchanged_callback(GtkFileChooserButton *wi
// NB: it's important to use gtk_file_chooser_get_filename instead of // NB: it's important to use gtk_file_chooser_get_filename instead of
// gtk_file_chooser_get_current_folder (see GTK docs) ! // gtk_file_chooser_get_current_folder (see GTK docs) !
wxGtkString filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget))); wxGtkString filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)));
p->UpdatePath(filename); p->GTKUpdatePath(filename);
// since GtkFileChooserButton when used to pick directories also uses a combobox, // since GtkFileChooserButton when used to pick directories also uses a combobox,
// maybe that the current folder has been changed but not through the GtkFileChooserDialog // maybe that the current folder has been changed but not through the GtkFileChooserDialog
@@ -187,7 +188,7 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id,
long style, const wxValidator& validator, long style, const wxValidator& validator,
const wxString &name ) const wxString &name )
{ {
if (!gtk_check_version(2,6,0)) if ( !(style & wxDIRP_USE_TEXTCTRL) && !gtk_check_version(2,6,0) )
{ {
// VERY IMPORTANT: this code is identic to relative code in wxFileButton; // VERY IMPORTANT: this code is identic to relative code in wxFileButton;
// if you find a problem here, fix it also in wxFileButton ! // if you find a problem here, fix it also in wxFileButton !
@@ -226,6 +227,7 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id,
m_widget = gtk_file_chooser_button_new_with_dialog( m_dialog->m_widget ); m_widget = gtk_file_chooser_button_new_with_dialog( m_dialog->m_widget );
g_object_ref(m_widget); g_object_ref(m_widget);
gtk_widget_show(m_widget); gtk_widget_show(m_widget);
// GtkFileChooserButton signals // GtkFileChooserButton signals
@@ -247,6 +249,10 @@ wxDirButton::~wxDirButton()
{ {
} }
void wxDirButton::GTKUpdatePath(const char *gtkpath)
{
m_path = wxString::FromUTF8(gtkpath);
}
void wxDirButton::SetPath(const wxString& str) void wxDirButton::SetPath(const wxString& str)
{ {
if ( m_path == str ) if ( m_path == str )