fixing warning and compile error against 10.4

[wxWidgets.git] / include / wx / generic / filepickerg.h

diff --git a/include/wx/generic/filepickerg.h b/include/wx/generic/filepickerg.h
index 51a019b8df483118f7f0fbf0071055a07d6f2918..7469df9137863de52ece4c40d45add230a18aedf 100644 (file)
--- a/include/wx/generic/filepickerg.h
+++ b/include/wx/generic/filepickerg.h
@@ -13,13 +13,12 @@
 #define _WX_FILEDIRPICKER_H_
 
 #include "wx/button.h"
 #define _WX_FILEDIRPICKER_H_
 
 #include "wx/button.h"

-#include "wx/filename.h"

 #include "wx/filedlg.h"
 #include "wx/dirdlg.h"
 
 
 #include "wx/filedlg.h"
 #include "wx/dirdlg.h"
 
 

-extern WXDLLEXPORT_DATA(const wxEventType) wxEVT_COMMAND_DIRPICKER_CHANGED;
-extern WXDLLEXPORT_DATA(const wxEventType) wxEVT_COMMAND_FILEPICKER_CHANGED;
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_FILEPICKER_CHANGED, wxFileDirPickerEvent );

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


@@ -30,7 +29,7 @@ class WXDLLIMPEXP_CORE wxGenericFileDirButton : public wxButton,
                                                 public wxFileDirPickerWidgetBase
 {
 public:
                                                 public wxFileDirPickerWidgetBase
 {
 public:

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

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


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

+        Init();

         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 ~wxGenericFileDirButton() {}
+    virtual wxControl *AsControl() { return this; }

 
 public:     // overrideable
 
 
 public:     // overrideable
 


@@ -76,6 +76,15 @@ public:
 
 protected:
     wxString m_message, m_wildcard;
 
 protected:
     wxString m_message, m_wildcard;

+
+    // we just store the style passed to the ctor here instead of passing it to
+    // wxButton as some of our bits can conflict with wxButton styles and it
+    // just doesn't make sense to use picker styles for wxButton anyhow
+    long m_pickerStyle;
+
+private:
+    // common part of all ctors
+    void Init() { m_pickerStyle = -1; }

 };
 
 
 };
 
 


@@ -109,17 +118,23 @@ public:     // overrideable
 
     virtual long GetDialogStyle() const
     {
 
     virtual long GetDialogStyle() const
     {

+        // the derived class must initialize it if it doesn't use the
+        // non-default wxGenericFileDirButton ctor
+        wxASSERT_MSG( m_pickerStyle != -1,
+                      "forgot to initialize m_pickerStyle?" );
+
+

         long filedlgstyle = 0;
 
         long filedlgstyle = 0;
 

-        if (this->HasFlag(wxFLP_OPEN))
+        if ( m_pickerStyle & wxFLP_OPEN )

             filedlgstyle |= wxFD_OPEN;
             filedlgstyle |= wxFD_OPEN;

-        if (this->HasFlag(wxFLP_SAVE))
+        if ( m_pickerStyle & wxFLP_SAVE )

             filedlgstyle |= wxFD_SAVE;
             filedlgstyle |= wxFD_SAVE;

-        if (this->HasFlag(wxFLP_OVERWRITE_PROMPT))
+        if ( m_pickerStyle & wxFLP_OVERWRITE_PROMPT )

             filedlgstyle |= wxFD_OVERWRITE_PROMPT;
             filedlgstyle |= wxFD_OVERWRITE_PROMPT;

-        if (this->HasFlag(wxFLP_FILE_MUST_EXIST))
+        if ( m_pickerStyle & wxFLP_FILE_MUST_EXIST )

             filedlgstyle |= wxFD_FILE_MUST_EXIST;
             filedlgstyle |= wxFD_FILE_MUST_EXIST;

-        if (this->HasFlag(wxFLP_CHANGE_DIR))
+        if ( m_pickerStyle & wxFLP_CHANGE_DIR )

             filedlgstyle |= wxFD_CHANGE_DIR;
 
         return filedlgstyle;
             filedlgstyle |= wxFD_CHANGE_DIR;
 
         return filedlgstyle;


@@ -136,12 +151,14 @@ public:     // overrideable
         return p;
     }
 
         return p;
     }
 

+    wxEventType GetEventType() const
+        { return wxEVT_COMMAND_FILEPICKER_CHANGED; }
+
+protected:

     void UpdateDialogPath(wxDialog *p)
         { wxStaticCast(p, wxFileDialog)->SetPath(m_path); }
     void UpdatePathFromDialog(wxDialog *p)
         { m_path = wxStaticCast(p, wxFileDialog)->GetPath(); }
     void UpdateDialogPath(wxDialog *p)
         { wxStaticCast(p, wxFileDialog)->SetPath(m_path); }
     void UpdatePathFromDialog(wxDialog *p)
         { m_path = wxStaticCast(p, wxFileDialog)->GetPath(); }

-    wxEventType GetEventType() const
-        { return wxEVT_COMMAND_FILEPICKER_CHANGED; }

 
 private:
     DECLARE_DYNAMIC_CLASS(wxGenericFileButton)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxGenericFileButton)


@@ -177,11 +194,11 @@ public:     // overrideable
 
     virtual long GetDialogStyle() const
     {
 
     virtual long GetDialogStyle() const
     {

-        long dirdlgstyle = 0;
+        long dirdlgstyle = wxDD_DEFAULT_STYLE;

 
 

-        if (this->HasFlag(wxDIRP_DIR_MUST_EXIST))
+        if ( m_pickerStyle & wxDIRP_DIR_MUST_EXIST )

             dirdlgstyle |= wxDD_DIR_MUST_EXIST;
             dirdlgstyle |= wxDD_DIR_MUST_EXIST;

-        if (this->HasFlag(wxDIRP_CHANGE_DIR))
+        if ( m_pickerStyle & wxDIRP_CHANGE_DIR )

             dirdlgstyle |= wxDD_CHANGE_DIR;
 
         return dirdlgstyle;
             dirdlgstyle |= wxDD_CHANGE_DIR;
 
         return dirdlgstyle;


@@ -193,12 +210,14 @@ public:     // overrideable
                                    GetDialogStyle());
     }
 
                                    GetDialogStyle());
     }
 

+    wxEventType GetEventType() const
+        { return wxEVT_COMMAND_DIRPICKER_CHANGED; }
+
+protected:

     void UpdateDialogPath(wxDialog *p)
         { wxStaticCast(p, wxDirDialog)->SetPath(m_path); }
     void UpdatePathFromDialog(wxDialog *p)
         { m_path = wxStaticCast(p, wxDirDialog)->GetPath(); }
     void UpdateDialogPath(wxDialog *p)
         { wxStaticCast(p, wxDirDialog)->SetPath(m_path); }
     void UpdatePathFromDialog(wxDialog *p)
         { m_path = wxStaticCast(p, wxDirDialog)->GetPath(); }

-    wxEventType GetEventType() const
-        { return wxEVT_COMMAND_DIRPICKER_CHANGED; }

 
 private:
     DECLARE_DYNAMIC_CLASS(wxGenericDirButton)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxGenericDirButton)