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 14267d626017c7ef749a18cddde702a35b443568..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     */ \


@@ -107,8 +99,6 @@ public:     // overrides
     FILEDIRBTN_OVERRIDES
 
 protected:
     FILEDIRBTN_OVERRIDES
 
 protected:

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

     wxDialog *m_dialog;
 
 private:
     wxDialog *m_dialog;
 
 private:


@@ -178,13 +168,6 @@ public:     // overrides
     FILEDIRBTN_OVERRIDES
 
 protected:
     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


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