Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/gtk/filepicker.h b/include/wx/gtk/filepicker.h
index 0030e4c61cc4bb3a869e755158a95a30eaad3724..27e1fdc7796363927df01a59a74338077764f19d 100644 (file)
--- a/include/wx/gtk/filepicker.h
+++ b/include/wx/gtk/filepicker.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:     14/4/2006
 // Copyright:   (c) Francesco Montorsi
 // Modified by:
 // Created:     14/4/2006
 // Copyright:   (c) Francesco Montorsi

-// RCS-ID:      $Id$

 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -17,8 +16,6 @@
 // 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
 //-----------------------------------------------------------------------------
 // wxFileButton and wxDirButton shared code
 // (cannot be a base class since they need to derive from wxGenericFileButton


@@ -36,12 +33,6 @@
         return NULL;                                                          \
     }                                                                         \
                                                                               \
         return NULL;                                                          \
     }                                                                         \
                                                                               \

-    virtual bool Destroy()                                                    \
-    {                                                                         \
-        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     */ \
     /* 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     */ \


@@ -49,7 +40,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  */ \
     /*      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; }
 
 
         { return NULL; }
 
 


@@ -60,7 +53,7 @@
 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,


@@ -73,7 +66,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);
     }


@@ -98,19 +92,8 @@ public:     // overrides
     // event handler for the click
     void OnDialogOK(wxCommandEvent &);
 
     // 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);
     virtual void SetPath(const wxString &str);

+    virtual void SetInitialDirectory(const wxString& dir);

 
     // see macro defined above
     FILEDIRBTN_OVERRIDES
 
     // see macro defined above
     FILEDIRBTN_OVERRIDES


@@ -119,6 +102,9 @@ protected:
     wxDialog *m_dialog;
 
 private:
     wxDialog *m_dialog;
 
 private:

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

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


@@ -144,6 +130,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);
     }


@@ -174,28 +162,27 @@ public:     // overrides
     }
 
     virtual void SetPath(const wxString &str);
     }
 
     virtual void SetPath(const wxString &str);

+    virtual void SetInitialDirectory(const wxString& dir);

 
     // see macro defined above
     FILEDIRBTN_OVERRIDES
 
 protected:
 
     // 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;
 
     wxDialog *m_dialog;
 
 public:    // used by the GTK callback only
 
     bool m_bIgnoreNextChange;
 

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

 
 private:
 
 private:

+    void Init()
+    {
+        m_dialog = NULL;
+        m_bIgnoreNextChange = false;
+    }
+

     DECLARE_DYNAMIC_CLASS(wxDirButton)
 };
 
     DECLARE_DYNAMIC_CLASS(wxDirButton)
 };