fixing osx_carbon

[wxWidgets.git] / src / common / dirctrlcmn.cpp

diff --git a/src/common/dirctrlcmn.cpp b/src/common/dirctrlcmn.cpp
index 9a1974b14ae3cee57234219be941cdde30d2cc94..394c0c6c7ce9a21341dc05b48a7f26bbac3d8dc0 100644 (file)
--- a/src/common/dirctrlcmn.cpp
+++ b/src/common/dirctrlcmn.cpp
@@ -1,85 +1,89 @@
-/////////////////////////////////////////////////////////////////////////////\r
-// Name:        src/common/dirctrlcmn.cpp\r
-// Purpose:     wxGenericDirCtrl common code\r
-// Author:      Harm van der Heijden, Robert Roebling, Julian Smart\r
-// Modified by:\r
-// Created:     12/12/98\r
-// RCS-ID:      $Id: dirctrlg.cpp 45395 2007-04-11 00:23:19Z VZ $\r
-// Copyright:   (c) Harm van der Heijden, Robert Roebling and Julian Smart\r
-// Licence:     wxWindows licence\r
-/////////////////////////////////////////////////////////////////////////////\r
-\r
-// For compilers that support precompilation, includes "wx.h".\r
-#include "wx/wxprec.h"\r
-\r
-#ifdef __BORLANDC__\r
-    #pragma hdrstop\r
-#endif\r
-\r
-#if wxUSE_DIRDLG || wxUSE_FILEDLG\r
-\r
-#include "wx/generic/dirctrlg.h"\r
-\r
-//-----------------------------------------------------------------------------\r
-// XTI\r
-//-----------------------------------------------------------------------------\r
-\r
-wxDEFINE_FLAGS( wxGenericDirCtrlStyle )\r
-wxBEGIN_FLAGS( wxGenericDirCtrlStyle )\r
-    // new style border flags, we put them first to\r
-    // use them for streaming out\r
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)\r
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)\r
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)\r
-    wxFLAGS_MEMBER(wxBORDER_RAISED)\r
-    wxFLAGS_MEMBER(wxBORDER_STATIC)\r
-    wxFLAGS_MEMBER(wxBORDER_NONE)\r
-\r
-    // old style border flags\r
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)\r
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)\r
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)\r
-    wxFLAGS_MEMBER(wxRAISED_BORDER)\r
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)\r
-    wxFLAGS_MEMBER(wxBORDER)\r
-\r
-    // standard window styles\r
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)\r
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)\r
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)\r
-    wxFLAGS_MEMBER(wxWANTS_CHARS)\r
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)\r
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )\r
-    wxFLAGS_MEMBER(wxVSCROLL)\r
-    wxFLAGS_MEMBER(wxHSCROLL)\r
-\r
-    wxFLAGS_MEMBER(wxDIRCTRL_DIR_ONLY)\r
-    wxFLAGS_MEMBER(wxDIRCTRL_3D_INTERNAL)\r
-    wxFLAGS_MEMBER(wxDIRCTRL_SELECT_FIRST)\r
-    wxFLAGS_MEMBER(wxDIRCTRL_SHOW_FILTERS)\r
-wxEND_FLAGS( wxGenericDirCtrlStyle )\r
-\r
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxGenericDirCtrl, wxControl, "wx/dirctrl.h")\r
-\r
-wxBEGIN_PROPERTIES_TABLE(wxGenericDirCtrl)\r
-    wxHIDE_PROPERTY( Children )\r
-\r
-    wxPROPERTY( DefaultPath, wxString, SetDefaultPath, GetDefaultPath, \\r
-                wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), wxT("group"))\r
-    wxPROPERTY( Filter, wxString, SetFilter, GetFilter, wxEMPTY_PARAMETER_VALUE, \\r
-                0 /*flags*/, wxT("Helpstring"), wxT("group") )\r
-    wxPROPERTY( DefaultFilter, int, SetFilterIndex, GetFilterIndex, \\r
-                wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), wxT("group") )\r
-\r
-    wxPROPERTY_FLAGS( WindowStyle, wxGenericDirCtrlStyle, long, SetWindowStyleFlag, \\r
-                      GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0, wxT("Helpstring"), \\r
-                      wxT("group") )\r
-wxEND_PROPERTIES_TABLE()\r
-\r
-wxEMPTY_HANDLERS_TABLE(wxGenericDirCtrl)\r
-\r
-wxCONSTRUCTOR_8( wxGenericDirCtrl, wxWindow*, Parent, wxWindowID, Id, \\r
-                 wxString, DefaultPath, wxPoint, Position, wxSize, Size, \\r
-                 long, WindowStyle, wxString, Filter, int, DefaultFilter )\r
-\r
-#endif // wxUSE_DIRDLG || wxUSE_FILEDLG\r
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/dirctrlcmn.cpp
+// Purpose:     wxGenericDirCtrl common code
+// Author:      Harm van der Heijden, Robert Roebling, Julian Smart
+// Modified by:
+// Created:     12/12/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Harm van der Heijden, Robert Roebling and Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_DIRDLG || wxUSE_FILEDLG
+
+#include "wx/generic/dirctrlg.h"
+
+extern WXDLLEXPORT_DATA(const char) wxDirDialogNameStr[] = "wxDirCtrl";
+extern WXDLLEXPORT_DATA(const char) wxDirDialogDefaultFolderStr[] = "/";
+extern WXDLLEXPORT_DATA(const char) wxDirSelectorPromptStr[] = "Select a directory";
+
+//-----------------------------------------------------------------------------
+// XTI
+//-----------------------------------------------------------------------------
+
+wxDEFINE_FLAGS( wxGenericDirCtrlStyle )
+wxBEGIN_FLAGS( wxGenericDirCtrlStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxDIRCTRL_DIR_ONLY)
+    wxFLAGS_MEMBER(wxDIRCTRL_3D_INTERNAL)
+    wxFLAGS_MEMBER(wxDIRCTRL_SELECT_FIRST)
+    wxFLAGS_MEMBER(wxDIRCTRL_SHOW_FILTERS)
+wxEND_FLAGS( wxGenericDirCtrlStyle )
+
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxGenericDirCtrl, wxControl, "wx/dirctrl.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxGenericDirCtrl)
+    wxHIDE_PROPERTY( Children )
+
+    wxPROPERTY( DefaultPath, wxString, SetDefaultPath, GetDefaultPath, \
+                wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), wxT("group"))
+    wxPROPERTY( Filter, wxString, SetFilter, GetFilter, wxEMPTY_PARAMETER_VALUE, \
+                0 /*flags*/, wxT("Helpstring"), wxT("group") )
+    wxPROPERTY( DefaultFilter, int, SetFilterIndex, GetFilterIndex, \
+                wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), wxT("group") )
+
+    wxPROPERTY_FLAGS( WindowStyle, wxGenericDirCtrlStyle, long, SetWindowStyleFlag, \
+                      GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0, wxT("Helpstring"), \
+                      wxT("group") )
+wxEND_PROPERTIES_TABLE()
+
+wxEMPTY_HANDLERS_TABLE(wxGenericDirCtrl)
+
+wxCONSTRUCTOR_8( wxGenericDirCtrl, wxWindow*, Parent, wxWindowID, Id, \
+                 wxString, DefaultPath, wxPoint, Position, wxSize, Size, \
+                 long, WindowStyle, wxString, Filter, int, DefaultFilter )
+
+#endif // wxUSE_DIRDLG || wxUSE_FILEDLG