Add wxUSE_UNICODE guard around wxDF_UNICODETEXT in the sample.

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

diff --git a/include/wx/gtk/filepicker.h b/include/wx/gtk/filepicker.h
index f3f6803f710c60a0d3c554f34cdbacf35bfe3e35..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:
-    wxFileButton() { m_dialog = NULL; }
+    wxFileButton() { Init(); }
     wxFileButton(wxWindow *parent,
                  wxWindowID id,
                  const wxString& label = wxFilePickerWidgetLabel,
@@ -74,7 +74,8 @@ public:
                  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);
     }
@@ -105,8 +106,14 @@ public:     // overrides
     FILEDIRBTN_OVERRIDES
 
 protected:
+    virtual bool GTKShouldConnectSizeRequest() const { return false; }
+
     wxDialog *m_dialog;
 
+private:
+    // common part of all ctors
+    void Init() { m_dialog = NULL; }
+
     DECLARE_DYNAMIC_CLASS(wxFileButton)
 };
 
@@ -132,6 +139,8 @@ public:
     {
         Init();
 
+        m_pickerStyle = style;
+
         Create(parent, id, label, path, message, wxEmptyString,
                 pos, size, style, validator, name);
     }