make wxTmemchr() return (and take) char* instead of void* in ANSI build too

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

diff --git a/include/wx/gtk/filepicker.h b/include/wx/gtk/filepicker.h
index 50e533f9eed2e16ada722e5d1cd482bf0bff18ef..bb91c6d55471e208fb95a249f7bbad00941707bd 100644 (file)
--- a/include/wx/gtk/filepicker.h
+++ b/include/wx/gtk/filepicker.h
@@ -17,8 +17,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


@@ -38,9 +36,21 @@
                                                                               \
     virtual bool Destroy()                                                    \
     {                                                                         \
                                                                               \
     virtual bool Destroy()                                                    \
     {                                                                         \

-        m_dialog->Destroy();                                                  \
+        if (m_dialog)                                                         \
+            m_dialog->Destroy();                                              \

         return wxButton::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& windows) const         \
+        { return NULL; }

 
 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------


@@ -88,9 +98,6 @@ 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...
     // 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...


@@ -108,7 +115,6 @@ public:     // some overrides
 protected:
     wxDialog *m_dialog;
 
 protected:
     wxDialog *m_dialog;
 

-private:

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