Include gdk/gdkkeysyms-compat.h.

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

diff --git a/include/wx/gtk/filepicker.h b/include/wx/gtk/filepicker.h
index cda74e3da1dc304883a60051817ccc6b05b9b13e..2276335e9127cc53c70901e5f1f84320143c5849 100644 (file)
--- a/include/wx/gtk/filepicker.h
+++ b/include/wx/gtk/filepicker.h
@@ -61,7 +61,7 @@ protected:                                                                    \
 class WXDLLIMPEXP_CORE wxFileButton : public wxGenericFileButton
 {
 public:
 class WXDLLIMPEXP_CORE wxFileButton : public wxGenericFileButton
 {
 public:

-    wxFileButton() { m_dialog = NULL; }
+    wxFileButton() { Init(); }

     wxFileButton(wxWindow *parent,
                  wxWindowID id,
                  const wxString& label = wxFilePickerWidgetLabel,
     wxFileButton(wxWindow *parent,
                  wxWindowID id,
                  const wxString& label = wxFilePickerWidgetLabel,


@@ -74,7 +74,8 @@ public:
                  const wxValidator& validator = wxDefaultValidator,
                  const wxString& name = wxFilePickerWidgetNameStr)
     {
                  const wxValidator& validator = wxDefaultValidator,
                  const wxString& name = wxFilePickerWidgetNameStr)
     {

-        m_dialog = NULL;
+        Init();
+        m_pickerStyle = style;

         Create(parent, id, label, path, message, wildcard,
                pos, size, style, validator, name);
     }
         Create(parent, id, label, path, message, wildcard,
                pos, size, style, validator, name);
     }


@@ -105,8 +106,14 @@ public:     // overrides
     FILEDIRBTN_OVERRIDES
 
 protected:
     FILEDIRBTN_OVERRIDES
 
 protected:

+    virtual bool GTKShouldConnectSizeRequest() const { return false; }
+

     wxDialog *m_dialog;
 
     wxDialog *m_dialog;
 

+private:
+    // common part of all ctors
+    void Init() { m_dialog = NULL; }
+

     DECLARE_DYNAMIC_CLASS(wxFileButton)
 };
 
     DECLARE_DYNAMIC_CLASS(wxFileButton)
 };
 


@@ -132,6 +139,8 @@ public:
     {
         Init();
 
     {
         Init();
 

+        m_pickerStyle = style;
+

         Create(parent, id, label, path, message, wxEmptyString,
                 pos, size, style, validator, name);
     }
         Create(parent, id, label, path, message, wxEmptyString,
                 pos, size, style, validator, name);
     }


@@ -180,9 +189,6 @@ public:    // used by the GTK callback only
 
     bool m_bIgnoreNextChange;
 
 
     bool m_bIgnoreNextChange;
 

-    void UpdatePath(const char *gtkpath)
-        { m_path = wxString::FromAscii(gtkpath); }
-

     void GTKUpdatePath(const char *gtkpath);
 
 private:
     void GTKUpdatePath(const char *gtkpath);
 
 private: