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 8b92ee6d0a258c4a278aef4167e9a4da35ce0e0b..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
 /////////////////////////////////////////////////////////////////////////////
 


@@ -34,13 +33,6 @@
         return NULL;                                                          \
     }                                                                         \
                                                                               \
         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     */ \
     /* 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     */ \


@@ -61,7 +53,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 +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);
     }


@@ -100,15 +93,18 @@ public:     // overrides
     void OnDialogOK(wxCommandEvent &);
 
     virtual void SetPath(const wxString &str);
     void OnDialogOK(wxCommandEvent &);
 
     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:

-    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)
 };
 


@@ -134,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);
     }


@@ -164,18 +162,12 @@ 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
     wxDialog *m_dialog;
 
 public:    // used by the GTK callback only


@@ -185,6 +177,12 @@ public:    // used by the GTK callback only
     void GTKUpdatePath(const char *gtkpath);
 
 private:
     void GTKUpdatePath(const char *gtkpath);
 
 private:

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

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