#4479: wx.ComboBox needs a SetFont method

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

diff --git a/include/wx/generic/dirdlgg.h b/include/wx/generic/dirdlgg.h
index a076fa4ada4e54413480de3451064fd0973706af..79c15b278dde407fc01597c013c4190ad016ec80 100644 (file)
--- a/include/wx/generic/dirdlgg.h
+++ b/include/wx/generic/dirdlgg.h
@@ -15,25 +15,19 @@
 #ifndef _WX_DIRDLGG_H_
 #define _WX_DIRDLGG_H_
 
 #ifndef _WX_DIRDLGG_H_
 #define _WX_DIRDLGG_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "dirdlgg.h"
-#endif
-
-class WXDLLEXPORT wxGenericDirCtrl;
-class WXDLLEXPORT wxTextCtrl;
-class WXDLLEXPORT wxTreeEvent;
+class WXDLLIMPEXP_FWD_CORE wxGenericDirCtrl;
+class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
+class WXDLLIMPEXP_FWD_CORE wxTreeEvent;

 
 // we may be included directly as well as from wx/dirdlg.h (FIXME)
 
 // we may be included directly as well as from wx/dirdlg.h (FIXME)

-extern WXDLLEXPORT_DATA(const wxChar*) wxDirDialogNameStr;
-extern WXDLLEXPORT_DATA(const wxChar*) wxDirSelectorPromptStr;
-#ifndef wxDD_DEFAULT_STYLE
+extern WXDLLIMPEXP_DATA_CORE(const char) wxDirDialogNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxDirSelectorPromptStr[];

 
 

+#ifndef wxDD_DEFAULT_STYLE

 #ifdef __WXWINCE__
 #ifdef __WXWINCE__

-    #define wxDD_DEFAULT_STYLE \
-        (wxDEFAULT_DIALOG_STYLE | wxDD_NEW_DIR_BUTTON)
+    #define wxDD_DEFAULT_STYLE      wxDEFAULT_DIALOG_STYLE

 #else
 #else

-    #define wxDD_DEFAULT_STYLE \
-        (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON)
+    #define wxDD_DEFAULT_STYLE      (wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)

 #endif
 #endif
 
 #endif
 #endif
 


@@ -43,30 +37,34 @@ extern WXDLLEXPORT_DATA(const wxChar*) wxDirSelectorPromptStr;
 // wxGenericDirDialog
 //-----------------------------------------------------------------------------
 
 // wxGenericDirDialog
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGenericDirDialog : public wxDialog
+class WXDLLIMPEXP_CORE wxGenericDirDialog : public wxDirDialogBase

 {
 public:
 {
 public:

-    wxGenericDirDialog() : wxDialog() { }
+    wxGenericDirDialog() : wxDirDialogBase() { }

 
     wxGenericDirDialog(wxWindow* parent,
                        const wxString& title = wxDirSelectorPromptStr,
                        const wxString& defaultPath = wxEmptyString,
                        long style = wxDD_DEFAULT_STYLE,
                        const wxPoint& pos = wxDefaultPosition,
 
     wxGenericDirDialog(wxWindow* parent,
                        const wxString& title = wxDirSelectorPromptStr,
                        const wxString& defaultPath = wxEmptyString,
                        long style = wxDD_DEFAULT_STYLE,
                        const wxPoint& pos = wxDefaultPosition,

-                       const wxSize& sz = wxSize(450, 550),
+                       const wxSize& sz = wxDefaultSize,//Size(450, 550),
+                       const wxString& name = wxDirDialogNameStr);
+
+    bool Create(wxWindow* parent,
+                const wxString& title = wxDirSelectorPromptStr,
+                const wxString& defaultPath = wxEmptyString,
+                long style = wxDD_DEFAULT_STYLE,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& sz = wxDefaultSize,//Size(450, 550),

                        const wxString& name = wxDirDialogNameStr);
 
     //// Accessors
                        const wxString& name = wxDirDialogNameStr);
 
     //// Accessors

-    void SetMessage(const wxString& message) { m_message = message; }

     void SetPath(const wxString& path);
     void SetPath(const wxString& path);

-    void SetStyle(long style) { m_dialogStyle = style; }
-
-    wxString GetMessage() const { return m_message; }

     wxString GetPath() const;
     wxString GetPath() const;

-    long GetStyle() const { return m_dialogStyle; }

 
     //// Overrides
     virtual int ShowModal();
 
     //// Overrides
     virtual int ShowModal();

+    virtual void EndModal(int retCode);

 
     // this one is specific to wxGenericDirDialog
     wxTextCtrl* GetInputCtrl() const { return m_input; }
 
     // this one is specific to wxGenericDirDialog
     wxTextCtrl* GetInputCtrl() const { return m_input; }


@@ -81,9 +79,6 @@ protected:
     void OnGoHome(wxCommandEvent& event);
     void OnShowHidden(wxCommandEvent& event);
 
     void OnGoHome(wxCommandEvent& event);
     void OnShowHidden(wxCommandEvent& event);
 

-    wxString          m_message;
-    long              m_dialogStyle;
-    wxString          m_path;

     wxGenericDirCtrl* m_dirCtrl;
     wxTextCtrl*       m_input;
 
     wxGenericDirCtrl* m_dirCtrl;
     wxTextCtrl*       m_input;