]> git.saurik.com Git - wxWidgets.git/blobdiff - include/wx/gtk/filepicker.h
Automatically adjust toolbar's tool size if the provided bitmaps
[wxWidgets.git] / include / wx / gtk / filepicker.h
index 0030e4c61cc4bb3a869e755158a95a30eaad3724..7b5a7da72eb7bbdf6a1c31bae5d7eb70a2fdd4d7 100644 (file)
@@ -17,8 +17,6 @@
 // that GTK+ < 2.4
 #include "wx/generic/filepickerg.h"
 
-
-
 //-----------------------------------------------------------------------------
 // wxFileButton and wxDirButton shared code
 // (cannot be a base class since they need to derive from wxGenericFileButton
@@ -38,7 +36,8 @@
                                                                               \
     virtual bool Destroy()                                                    \
     {                                                                         \
-        m_dialog->Destroy();                                                  \
+        if (m_dialog)                                                         \
+            m_dialog->Destroy();                                              \
         return wxButton::Destroy();                                           \
     }                                                                         \
                                                                               \
@@ -49,7 +48,9 @@
     /*      invalid cast from `GtkFileChooserButton' to  `GtkButton'       */ \
     /* so, override wxButton::GTKGetWindow and return NULL as GTK+ doesn't */ \
     /* give us access to the internal GdkWindow of a GtkFileChooserButton  */ \
-    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const         \
+protected:                                                                    \
+    virtual GdkWindow *                                                       \
+    GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const                  \
         { return NULL; }
 
 
@@ -98,18 +99,6 @@ public:     // overrides
     // event handler for the click
     void OnDialogOK(wxCommandEvent &);
 
-
-public:     // some overrides
-
-    // 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
@@ -118,7 +107,6 @@ public:     // some overrides
 protected:
     wxDialog *m_dialog;
 
-private:
     DECLARE_DYNAMIC_CLASS(wxFileButton)
 };