warning for 2.5.3

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

diff --git a/include/wx/generic/dirdlgg.h b/include/wx/generic/dirdlgg.h
index 4996965dd36030cbbbf7ecccfaed95ca19ab32d2..3133ca5ab60f8c9555fe2fc03f23fca1509b1e2a 100644 (file)
--- a/include/wx/generic/dirdlgg.h
+++ b/include/wx/generic/dirdlgg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dirdlgg.h
+// Name:        wx/generic/dirdlgg.h

 // Purpose:     wxGenericDirCtrl class
 //              Builds on wxDirCtrl class written by Robert Roebling for the
 //              wxFile application, modified by Harm van der Heijden.
 // Purpose:     wxGenericDirCtrl class
 //              Builds on wxDirCtrl class written by Robert Roebling for the
 //              wxFile application, modified by Harm van der Heijden.


@@ -15,47 +15,55 @@
 #ifndef _WX_DIRDLGG_H_
 #define _WX_DIRDLGG_H_
 
 #ifndef _WX_DIRDLGG_H_
 #define _WX_DIRDLGG_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "dirdlgg.h"
 #endif
 
 #pragma interface "dirdlgg.h"
 #endif
 

-#include "wx/defs.h"
-
-#if wxUSE_DIRDLG
-
-#include "wx/dialog.h"

 class WXDLLEXPORT wxGenericDirCtrl;
 class WXDLLEXPORT wxTextCtrl;
 class WXDLLEXPORT wxTreeEvent;
 
 class WXDLLEXPORT wxGenericDirCtrl;
 class WXDLLEXPORT wxTextCtrl;
 class WXDLLEXPORT wxTreeEvent;
 

+// we may be included directly as well as from wx/dirdlg.h (FIXME)
+WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxDirSelectorPromptStr;
+#ifndef wxDD_DEFAULT_STYLE
+    #define wxDD_DEFAULT_STYLE \
+        (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON)
+#endif
+
+#include "wx/dialog.h"
+

 //-----------------------------------------------------------------------------
 // wxGenericDirDialog
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxGenericDirDialog
 //-----------------------------------------------------------------------------
 

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

 {
 public:
 {
 public:

-    wxGenericDirDialog(): wxDialog() {}
-    wxGenericDirDialog(wxWindow* parent, const wxString& title,
+    wxGenericDirDialog() : wxDialog() { }
+
+    wxGenericDirDialog(wxWindow* parent,
+                       const wxString& title = wxDirSelectorPromptStr,

                        const wxString& defaultPath = wxEmptyString,
                        const wxString& defaultPath = wxEmptyString,

-                       long style = wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON,
+                       long style = wxDD_DEFAULT_STYLE,

                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& sz = wxSize(450, 550),
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& sz = wxSize(450, 550),

-                       const wxString& name = _T("dialog"));
+                       const wxString& name = wxDirDialogNameStr);

 
     //// Accessors
 
     //// Accessors

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

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

-    inline void SetStyle(long style) { m_dialogStyle = style; }
+    void SetStyle(long style) { m_dialogStyle = style; }

 
 

-    inline wxString GetMessage(void) const { return m_message; }
-    wxString GetPath(void) const;
-    inline long GetStyle(void) const { return m_dialogStyle; }
-
-    wxTextCtrl* GetInputCtrl() const { return m_input; }
+    wxString GetMessage() const { return m_message; }
+    wxString GetPath() const;
+    long GetStyle() const { return m_dialogStyle; }

 
     //// Overrides
 
     //// Overrides

-    int ShowModal();
+    virtual int ShowModal();
+
+    // this one is specific to wxGenericDirDialog
+    wxTextCtrl* GetInputCtrl() const { return m_input; }

 
 protected:
     //// Event handlers
 
 protected:
     //// Event handlers


@@ -74,12 +82,7 @@ protected:
     wxTextCtrl*       m_input;
 
     DECLARE_EVENT_TABLE()
     wxTextCtrl*       m_input;
 
     DECLARE_EVENT_TABLE()

+    DECLARE_DYNAMIC_CLASS(wxGenericDirDialog)

 };
 
 };
 

-#if !defined(__WXMSW__) && !defined(__WXMAC__)
-    #define wxDirDialog wxGenericDirDialog
-#endif
-
-#endif // wxUSE_DIRDLG
-

 #endif // _WX_DIRDLGG_H_
 #endif // _WX_DIRDLGG_H_