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

Commit pickers-fixes.patch added to 1472329 (Francesco Montorsi)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2006-06-02 12:00:30 +00:00
parent 7ba03e3cd2
commit 556151f5ff
14 changed files with 179 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gtk/filepicker.cpp
View File

@@ -66,9 +66,13 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
}
// create the dialog associated with this button
// NB: unlike generic implementation, native GTK implementation needs to create
// the filedialog here as it needs to use gtk_file_chooser_button_new_with_dialog()
SetWindowStyle(style);
m_path = path;
if (!CreateDialog(message, wildcard))
m_message = message;
m_wildcard = wildcard;
if ((m_dialog = CreateDialog()) == NULL)
return false;
// little trick used to avoid problems when there are other GTK windows 'grabbed':
@@ -122,7 +126,7 @@ void wxFileButton::OnDialogOK(wxCommandEvent& ev)
if (ev.GetId() == wxID_OK)
{
// ...update our path
UpdatePathFromDialog();
UpdatePathFromDialog(m_dialog);
// ...and fire an event
wxFileDirPickerEvent event(wxEVT_COMMAND_FILEPICKER_CHANGED, this, GetId(), m_path);
@@ -199,8 +203,9 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id,
// create the dialog associated with this button
SetWindowStyle(style);
m_path = path;
if (!CreateDialog(message, wildcard))
m_message = message;
m_wildcard = wildcard;
if ((m_dialog = CreateDialog()) == NULL)
return false;
// little trick used to avoid problems when there are other GTK windows 'grabbed':