1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
|
Index: /wxWidgets/trunk/src/gtk/dirdlg.cpp
===================================================================
--- /wxWidgets/trunk/src/gtk/dirdlg.cpp (revision 72605)
+++ /wxWidgets/trunk/src/gtk/dirdlg.cpp (revision 72779)
@@ -36,47 +36,13 @@
#endif
-//-----------------------------------------------------------------------------
-// "clicked" for OK-button
-//-----------------------------------------------------------------------------
-
extern "C" {
-static void gtk_dirdialog_ok_callback(GtkWidget *widget, wxDirDialog *dialog)
-{
- // change to the directory where the user went if asked
- if (dialog->HasFlag(wxDD_CHANGE_DIR))
- {
- wxGtkString filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)));
- chdir(filename);
- }
-
- wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
- event.SetEventObject(dialog);
- dialog->HandleWindowEvent(event);
-}
-}
-
-//-----------------------------------------------------------------------------
-// "clicked" for Cancel-button
-//-----------------------------------------------------------------------------
-
-extern "C" {
-static void gtk_dirdialog_cancel_callback(GtkWidget *WXUNUSED(w),
- wxDirDialog *dialog)
-{
- wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
- event.SetEventObject(dialog);
- dialog->HandleWindowEvent(event);
-}
-}
-
-extern "C" {
-static void gtk_dirdialog_response_callback(GtkWidget *w,
+static void gtk_dirdialog_response_callback(GtkWidget * WXUNUSED(w),
gint response,
wxDirDialog *dialog)
{
if (response == GTK_RESPONSE_ACCEPT)
- gtk_dirdialog_ok_callback(w, dialog);
+ dialog->GTKOnAccept();
else // GTK_RESPONSE_CANCEL or GTK_RESPONSE_NONE
- gtk_dirdialog_cancel_callback(w, dialog);
+ dialog->GTKOnCancel();
}
}
@@ -87,8 +53,4 @@
IMPLEMENT_DYNAMIC_CLASS(wxDirDialog, wxDialog)
-
-BEGIN_EVENT_TABLE(wxDirDialog, wxDirDialogBase)
- EVT_BUTTON(wxID_OK, wxDirDialog::OnFakeOk)
-END_EVENT_TABLE()
wxDirDialog::wxDirDialog(wxWindow* parent,
@@ -157,13 +119,26 @@
if ( !defaultPath.empty() )
- gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(m_widget),
- wxGTK_CONV_FN(defaultPath) );
+ SetPath(defaultPath);
return true;
}
-void wxDirDialog::OnFakeOk(wxCommandEvent& WXUNUSED(event))
+void wxDirDialog::GTKOnAccept()
{
+ wxGtkString str(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget)));
+ m_selectedDirectory = wxString::FromUTF8(str);
+
+ // change to the directory where the user went if asked
+ if (HasFlag(wxDD_CHANGE_DIR))
+ {
+ chdir(m_selectedDirectory);
+ }
+
EndDialog(wxID_OK);
+}
+
+void wxDirDialog::GTKOnCancel()
+{
+ EndDialog(wxID_CANCEL);
}
@@ -187,6 +162,5 @@
wxString wxDirDialog::GetPath() const
{
- wxGtkString str(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget)));
- return wxString::FromUTF8(str);
+ return m_selectedDirectory;
}
Index: /wxWidgets/trunk/include/wx/gtk/dirdlg.h
===================================================================
--- /wxWidgets/trunk/include/wx/gtk/dirdlg.h (revision 70898)
+++ /wxWidgets/trunk/include/wx/gtk/dirdlg.h (revision 72779)
@@ -43,4 +43,9 @@
+ // Implementation only.
+
+ void GTKOnAccept();
+ void GTKOnCancel();
+
protected:
// override this from wxTLW since the native
@@ -52,8 +57,7 @@
private:
- void OnFakeOk( wxCommandEvent &event );
+ wxString m_selectedDirectory;
DECLARE_DYNAMIC_CLASS(wxDirDialog)
- DECLARE_EVENT_TABLE()
};
|
