latest CW additions

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/file.cpp

@@ -144,6 +144,12 @@
 #define MAX_PATH 512
 #endif
 
+#ifdef __WXMAC__
+char gwxMacFileName[ MAX_PATH ] ;
+char gwxMacFileName2[ MAX_PATH ] ;
+char gwxMacFileName3[ MAX_PATH ] ;
+#endif
+
 // ============================================================================
 // implementation of wxFile
 // ============================================================================

src/common/fileconf.cpp

@@ -95,6 +95,8 @@ wxString wxFileConfig::GetGlobalDir()
     strDir = "/etc/";
   #elif defined(__WXSTUBS__)
     wxASSERT_MSG( FALSE, "TODO" ) ;
+  #elif defined(__WXMAC__)
+    wxASSERT_MSG( FALSE, "TODO" ) ;
   #else // Windows
     char szWinDir[MAX_PATH];
     ::GetWindowsDirectory(szWinDir, MAX_PATH);

src/common/gdicmn.cpp

@@ -270,6 +270,9 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
 
 // TODO for other implementations. This should really go into
 // platform-specific directories.
+#ifdef __WXMAC__
+  else return NULL;
+#endif
 #ifdef __WXSTUBS__
   else return NULL;
 #endif

src/mac/carbon/data.cpp

@@ -16,7 +16,7 @@
 #include "wx/wx.h"
 
 #if wxUSE_POSTSCRIPT
-#include "wx/postscrp.h"
+#include "wx/generic/dcpsg.h"
 #endif
 
 #define _MAXPATHLEN 500

src/mac/carbon/filedlg.cpp

@@ -23,7 +23,7 @@
 IMPLEMENT_CLASS(wxFileDialog, wxDialog)
 #endif
 
-char *wxFileSelector(const char *title,
+WXDLLEXPORT wxString wxFileSelector(const char *title,
                      const char *defaultDir, const char *defaultFileName,
                      const char *defaultExtension, const char *filter, int flags,
                      wxWindow *parent, int x, int y)
@@ -60,7 +60,7 @@ char *wxFileSelector(const char *title,
         return NULL;
 }
 
-char *wxFileSelectorEx(const char *title,
+WXDLLEXPORT wxString wxFileSelectorEx(const char *title,
                        const char *defaultDir,
                        const char *defaultFileName,
                        int* defaultFilterIndex,
@@ -105,7 +105,7 @@ int wxFileDialog::ShowModal()
 }
 
 // Generic file load/save dialog
-static char *
+static wxString
 wxDefaultFileSelector(bool load, const char *what, const char *extension, const char *default_name, wxWindow *parent)
 {
   char *ext = (char *)extension;
@@ -126,7 +126,7 @@ wxDefaultFileSelector(bool load, const char *what, const char *extension, const
 }
 
 // Generic file load dialog
-char *
+wxString
 wxLoadFileSelector(const char *what, const char *extension, const char *default_name, wxWindow *parent)
 {
   return wxDefaultFileSelector(TRUE, what, extension, default_name, parent);
@@ -134,7 +134,7 @@ wxLoadFileSelector(const char *what, const char *extension, const char *default_
 
 
 // Generic file save dialog
-char *
+wxString
 wxSaveFileSelector(const char *what, const char *extension, const char *default_name, wxWindow *parent)
 {
   return wxDefaultFileSelector(FALSE, what, extension, default_name, parent);

src/mac/carbon/scrolbar.cpp

@@ -18,6 +18,9 @@
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
 
+BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
+END_EVENT_TABLE()
+
 #endif
 
 // Scrollbar

src/mac/carbon/thread.cpp

@@ -24,6 +24,8 @@ enum thread_state {
   STATE_EXITED
 };
 
+#if wxUSE_THREADS
+
 /////////////////////////////////////////////////////////////////////////////
 // Static variables
 /////////////////////////////////////////////////////////////////////////////
@@ -259,3 +261,4 @@ public:
 
 IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
 
+#endif

src/mac/data.cpp

@@ -16,7 +16,7 @@
 #include "wx/wx.h"
 
 #if wxUSE_POSTSCRIPT
-#include "wx/postscrp.h"
+#include "wx/generic/dcpsg.h"
 #endif
 
 #define _MAXPATHLEN 500

src/mac/filedlg.cpp

@@ -23,7 +23,7 @@
 IMPLEMENT_CLASS(wxFileDialog, wxDialog)
 #endif
 
-char *wxFileSelector(const char *title,
+WXDLLEXPORT wxString wxFileSelector(const char *title,
                      const char *defaultDir, const char *defaultFileName,
                      const char *defaultExtension, const char *filter, int flags,
                      wxWindow *parent, int x, int y)
@@ -60,7 +60,7 @@ char *wxFileSelector(const char *title,
         return NULL;
 }
 
-char *wxFileSelectorEx(const char *title,
+WXDLLEXPORT wxString wxFileSelectorEx(const char *title,
                        const char *defaultDir,
                        const char *defaultFileName,
                        int* defaultFilterIndex,
@@ -105,7 +105,7 @@ int wxFileDialog::ShowModal()
 }
 
 // Generic file load/save dialog
-static char *
+static wxString
 wxDefaultFileSelector(bool load, const char *what, const char *extension, const char *default_name, wxWindow *parent)
 {
   char *ext = (char *)extension;
@@ -126,7 +126,7 @@ wxDefaultFileSelector(bool load, const char *what, const char *extension, const
 }
 
 // Generic file load dialog
-char *
+wxString
 wxLoadFileSelector(const char *what, const char *extension, const char *default_name, wxWindow *parent)
 {
   return wxDefaultFileSelector(TRUE, what, extension, default_name, parent);
@@ -134,7 +134,7 @@ wxLoadFileSelector(const char *what, const char *extension, const char *default_
 
 
 // Generic file save dialog
-char *
+wxString
 wxSaveFileSelector(const char *what, const char *extension, const char *default_name, wxWindow *parent)
 {
   return wxDefaultFileSelector(FALSE, what, extension, default_name, parent);

src/mac/scrolbar.cpp

@@ -18,6 +18,9 @@
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
 
+BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
+END_EVENT_TABLE()
+
 #endif
 
 // Scrollbar

src/mac/thread.cpp

@@ -24,6 +24,8 @@ enum thread_state {
   STATE_EXITED
 };
 
+#if wxUSE_THREADS
+
 /////////////////////////////////////////////////////////////////////////////
 // Static variables
 /////////////////////////////////////////////////////////////////////////////
@@ -259,3 +261,4 @@ public:
 
 IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
 
+#endif

src/msw/app.cpp

@@ -565,7 +565,7 @@ int wxEntry(WXHINSTANCE hInstance,
   // FIXME other compilers must support Win32 SEH (structured exception
   //       handling) too, just find the appropriate keyword in their docs!
   //       Please note that it's _not_ the same as C++ exceptions!
-#if !defined(__WXDEBUG__) && defined(_MSC_VER)
+#if !defined(__WXDEBUG__) && defined(_MSC_VER) && !defined(__MWERKS__)
     #define CATCH_PROGRAM_EXCEPTIONS
 
   __try {