1. fixed wxGTK notebook which was completely broken by the merge

[wxWidgets.git] / include / wx / msw / dirdlg.h

diff --git a/include/wx/msw/dirdlg.h b/include/wx/msw/dirdlg.h
index bbe29b3de56da2c09fb1524a4be8afe413068316..d49268d87ffda7efdfd2f7448e0a70f0176b87a1 100644 (file)
--- a/include/wx/msw/dirdlg.h
+++ b/include/wx/msw/dirdlg.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __DIRDLGH__
-#define __DIRDLGH__
+#ifndef _WX_DIRDLG_H_
+#define _WX_DIRDLG_H_

 
 #ifdef __GNUG__
 #pragma interface "dirdlg.h"
 
 #ifdef __GNUG__
 #pragma interface "dirdlg.h"


@@ -18,12 +18,14 @@
 
 #include "wx/dialog.h"
 
 
 #include "wx/dialog.h"
 

+WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorPromptStr;
+

 class WXDLLEXPORT wxDirDialog: public wxDialog
 {
 DECLARE_DYNAMIC_CLASS(wxDirDialog)
 public:
     wxDirDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr,
 class WXDLLEXPORT wxDirDialog: public wxDialog
 {
 DECLARE_DYNAMIC_CLASS(wxDirDialog)
 public:
     wxDirDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr,

-        const wxString& defaultPath = "",
+        const wxString& defaultPath = wxEmptyString,

         long style = 0, const wxPoint& pos = wxDefaultPosition);
 
     inline void SetMessage(const wxString& message) { m_message = message; }
         long style = 0, const wxPoint& pos = wxDefaultPosition);
 
     inline void SetMessage(const wxString& message) { m_message = message; }


@@ -44,4 +46,4 @@ protected:
 };
 
 #endif
 };
 
 #endif

-    // __DIRDLGH__
+    // _WX_DIRDLG_H_