made wxCommandEvent::GetInt() return int, not long (patch 1473771)

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

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index 0752c5e97224c0061bc47fe7f908f075f234ed4a..2afab201592a1edd9db89fa692e69e2d7b3220a3 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -20,9 +20,10 @@
 // constants
 // ----------------------------------------------------------------------------
 
 // constants
 // ----------------------------------------------------------------------------
 

-extern WXDLLEXPORT_DATA(const wxChar*) wxDirDialogNameStr;
-extern WXDLLEXPORT_DATA(const wxChar*) wxDirDialogDefaultFolderStr;
-extern WXDLLEXPORT_DATA(const wxChar*) wxDirSelectorPromptStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogDefaultFolderStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[];
+

 
 #ifdef __WXWINCE__
     #define wxDD_DEFAULT_STYLE \
 
 #ifdef __WXWINCE__
     #define wxDD_DEFAULT_STYLE \


@@ -83,6 +84,11 @@ public:
 
     #include "wx/mac/dirdlg.h"
 
 
     #include "wx/mac/dirdlg.h"
 

+// Native Cocoa
+#elif defined(__WXCOCOA__)
+
+    #include "wx/cocoa/dirdlg.h"
+

 // Other ports use generic implementation
 #elif defined(__WXMOTIF__) || \
       defined(__WXGTK__)   || \
 // Other ports use generic implementation
 #elif defined(__WXMOTIF__) || \
       defined(__WXGTK__)   || \