X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/64321998dfa6329a3d1266d9562ab43cb9046d85..8e4b5265cdd7aeea67c85eb0f50186641f09f7d8:/include/wx/gtk/filepicker.h?ds=inline

diff --git a/include/wx/gtk/filepicker.h b/include/wx/gtk/filepicker.h
index 0030e4c61c..bb91c6d554 100644
--- a/include/wx/gtk/filepicker.h
+++ b/include/wx/gtk/filepicker.h
@@ -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,6 +48,7 @@
     /*      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  */ \
+protected:                                                                    \
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const         \
         { return NULL; }
 
@@ -98,9 +98,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...
@@ -118,7 +115,6 @@ public:     // some overrides
 protected:
     wxDialog *m_dialog;
 
-private:
     DECLARE_DYNAMIC_CLASS(wxFileButton)
 };