routing native events first to the wx class and only if skipped call native handler

[wxWidgets.git] / include / wx / gtk / filepicker.h

diff --git a/include/wx/gtk/filepicker.h b/include/wx/gtk/filepicker.h
index 5a72f6f8a402aefd0c96fb6f23e4f12c68b41a3e..7b5a7da72eb7bbdf6a1c31bae5d7eb70a2fdd4d7 100644 (file)
--- a/include/wx/gtk/filepicker.h
+++ b/include/wx/gtk/filepicker.h
@@ -36,7 +36,8 @@
                                                                               \
     virtual bool Destroy()                                                    \
     {                                                                         \
                                                                               \
     virtual bool Destroy()                                                    \
     {                                                                         \

-        m_dialog->Destroy();                                                  \
+        if (m_dialog)                                                         \
+            m_dialog->Destroy();                                              \

         return wxButton::Destroy();                                           \
     }                                                                         \
                                                                               \
         return wxButton::Destroy();                                           \
     }                                                                         \
                                                                               \


@@ -48,7 +49,8 @@
     /* so, override wxButton::GTKGetWindow and return NULL as GTK+ doesn't */ \
     /* give us access to the internal GdkWindow of a GtkFileChooserButton  */ \
 protected:                                                                    \
     /* so, override wxButton::GTKGetWindow and return NULL as GTK+ doesn't */ \
     /* give us access to the internal GdkWindow of a GtkFileChooserButton  */ \
 protected:                                                                    \

-    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const         \
+    virtual GdkWindow *                                                       \
+    GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const                  \

         { return NULL; }
 
 
         { return NULL; }
 
 


@@ -97,15 +99,6 @@ public:     // overrides
     // event handler for the click
     void OnDialogOK(wxCommandEvent &);
 
     // event handler for the click
     void OnDialogOK(wxCommandEvent &);
 

-    // GtkFileChooserButton does not support GTK_FILE_CHOOSER_ACTION_SAVE
-    // so we replace it with GTK_FILE_CHOOSER_ACTION_OPEN; since wxFD_SAVE
-    // is not supported, wxFD_OVERWRITE_PROMPT isn't too...
-    virtual long GetDialogStyle() const
-    {
-         return (wxGenericFileButton::GetDialogStyle() &
-                     ~(wxFD_SAVE | wxFD_OVERWRITE_PROMPT)) | wxFD_OPEN;
-    }
-

     virtual void SetPath(const wxString &str);
 
     // see macro defined above
     virtual void SetPath(const wxString &str);
 
     // see macro defined above