Fixed wxDatePickerCtrl under OS X

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

diff --git a/include/wx/gtk/filepicker.h b/include/wx/gtk/filepicker.h
index f9dab6e24798c1c49140eb0167579d2152add8d3..7b5a7da72eb7bbdf6a1c31bae5d7eb70a2fdd4d7 100644 (file)
--- a/include/wx/gtk/filepicker.h
+++ b/include/wx/gtk/filepicker.h
@@ -17,6 +17,43 @@
 // that GTK+ < 2.4
 #include "wx/generic/filepickerg.h"
 
 // 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
+//  and from wxGenericDirButton classes !)
+//-----------------------------------------------------------------------------
+
+#define FILEDIRBTN_OVERRIDES                                                  \
+    /* NULL is because of a problem with destruction order which happens   */ \
+    /* if we pass GetParent(): in fact, this GTK native implementation     */ \
+    /* needs to create the dialog in ::Create() and not for each user      */ \
+    /* request in response to the user click as the generic implementation */ \
+    /* does.                                                               */ \
+    virtual wxWindow *GetDialogParent()                                       \
+    {                                                                         \
+        return NULL;                                                          \
+    }                                                                         \
+                                                                              \
+    virtual bool Destroy()                                                    \
+    {                                                                         \
+        if (m_dialog)                                                         \
+            m_dialog->Destroy();                                              \
+        return wxButton::Destroy();                                           \
+    }                                                                         \
+                                                                              \
+    /* even if wx derive from wxGenericFileButton, i.e. from wxButton, our */ \
+    /* native GTK+ widget does not derive from GtkButton thus *all* uses   */ \
+    /* GTK_BUTTON(m_widget) macro done by wxButton must be bypassed to     */ \
+    /* avoid bunch of GTK+ warnings like:                                  */ \
+    /*      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& WXUNUSED(windows)) const                  \
+        { return NULL; }
+
+

 //-----------------------------------------------------------------------------
 // wxFileButton
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxFileButton
 //-----------------------------------------------------------------------------


@@ -24,7 +61,7 @@
 class WXDLLIMPEXP_CORE wxFileButton : public wxGenericFileButton
 {
 public:
 class WXDLLIMPEXP_CORE wxFileButton : public wxGenericFileButton
 {
 public:

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

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


@@ -37,11 +74,12 @@ public:
                  const wxValidator& validator = wxDefaultValidator,
                  const wxString& name = wxFilePickerWidgetNameStr)
     {
                  const wxValidator& validator = wxDefaultValidator,
                  const wxString& name = wxFilePickerWidgetNameStr)
     {

+        m_dialog = NULL;

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

-    virtual ~wxFileButton() ;
+    virtual ~wxFileButton();

 
 
 public:     // overrides
 
 
 public:     // overrides


@@ -61,16 +99,14 @@ public:     // overrides
     // event handler for the click
     void OnDialogOK(wxCommandEvent &);
 
     // event handler for the click
     void OnDialogOK(wxCommandEvent &);
 

+    virtual void SetPath(const wxString &str);

 
 

-    // GtkFileChooserButton does not support GTK_FILE_CHOOSER_ACTION_SAVE
-    // so we replace it with GTK_FILE_CHOOSER_ACTION_OPEN
-    long GetDialogStyle() const
-    {
-        return (wxGenericFileButton::GetDialogStyle() & ~wxFD_SAVE) | wxFD_OPEN;
-    }
+    // see macro defined above
+    FILEDIRBTN_OVERRIDES

 
 

+protected:
+    wxDialog *m_dialog;

 
 

-private:

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


@@ -82,7 +118,7 @@ private:
 class WXDLLIMPEXP_CORE wxDirButton : public wxGenericDirButton
 {
 public:
 class WXDLLIMPEXP_CORE wxDirButton : public wxGenericDirButton
 {
 public:

-    wxDirButton() {}
+    wxDirButton() { Init(); }

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


@@ -94,6 +130,8 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxFilePickerWidgetNameStr)
     {
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxFilePickerWidgetNameStr)
     {

+        Init();
+

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


@@ -115,9 +153,6 @@ public:     // overrides
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxFilePickerWidgetNameStr);
 
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxFilePickerWidgetNameStr);
 

-    // used by the GTK callback only
-    void UpdatePath(char *gtkpath)
-        { m_path = wxString::FromAscii(gtkpath); }

 
     // GtkFileChooserButton does not support GTK_FILE_CHOOSER_CREATE_FOLDER
     // thus we must ensure that the wxDD_DIR_MUST_EXIST style was given
 
     // GtkFileChooserButton does not support GTK_FILE_CHOOSER_CREATE_FOLDER
     // thus we must ensure that the wxDD_DIR_MUST_EXIST style was given


@@ -126,9 +161,33 @@ public:     // overrides
         return (wxGenericDirButton::GetDialogStyle() | wxDD_DIR_MUST_EXIST);
     }
 
         return (wxGenericDirButton::GetDialogStyle() | wxDD_DIR_MUST_EXIST);
     }
 

+    virtual void SetPath(const wxString &str);
+
+    // see macro defined above
+    FILEDIRBTN_OVERRIDES
+
+protected:
+    // common part of all ctors
+    void Init()
+    {
+        m_dialog = NULL;
+        m_bIgnoreNextChange = false;
+    }
+
+    wxDialog *m_dialog;
+
+public:    // used by the GTK callback only
+
+    bool m_bIgnoreNextChange;
+
+    void UpdatePath(const char *gtkpath)
+        { m_path = wxString::FromAscii(gtkpath); }
+

 private:
     DECLARE_DYNAMIC_CLASS(wxDirButton)
 };
 
 private:
     DECLARE_DYNAMIC_CLASS(wxDirButton)
 };
 

+#undef FILEDIRBTN_OVERRIDES
+

 #endif // _WX_GTK_FILEPICKER_H_
 
 #endif // _WX_GTK_FILEPICKER_H_