Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

latest CW additions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
1999-02-01 15:00:12 +00:00
parent 95bbd57c9b
commit 169935ad4e
17 changed files with 2372 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/mac/filedlg.h
View File

@@ -67,23 +67,26 @@ public:
#define wxHIDE_READONLY 0x0008 #define wxHIDE_READONLY 0x0008
#define wxFILE_MUST_EXIST 0x0010 #define wxFILE_MUST_EXIST 0x0010
/*
// File selector - backward compatibility // File selector - backward compatibility
char* WXDLLEXPORT wxFileSelector(const char *message = wxFileSelectorPromptStr, const char *default_path = NULL, WXDLLEXPORT wxString wxFileSelector(const char *message = wxFileSelectorPromptStr, const char *default_path = NULL,
const char *default_filename = NULL, const char *default_extension = NULL, const char *default_filename = NULL, const char *default_extension = NULL,
const char *wildcard = wxFileSelectorDefaultWildcardStr, int flags = 0, const char *wildcard = wxFileSelectorDefaultWildcardStr, int flags = 0,
wxWindow *parent = NULL, int x = -1, int y = -1); wxWindow *parent = NULL, int x = -1, int y = -1);
// An extended version of wxFileSelector // An extended version of wxFileSelector
char* WXDLLEXPORT wxFileSelectorEx(const char *message = wxFileSelectorPromptStr, const char *default_path = NULL, WXDLLEXPORT wxString wxFileSelectorEx(const char *message = wxFileSelectorPromptStr, const char *default_path = NULL,
const char *default_filename = NULL, int *indexDefaultExtension = NULL, const char *default_filename = NULL, int *indexDefaultExtension = NULL,
const char *wildcard = wxFileSelectorDefaultWildcardStr, int flags = 0, const char *wildcard = wxFileSelectorDefaultWildcardStr, int flags = 0,
wxWindow *parent = NULL, int x = -1, int y = -1); wxWindow *parent = NULL, int x = -1, int y = -1);
// Generic file load dialog // Generic file load dialog
char* WXDLLEXPORT wxLoadFileSelector(const char *what, const char *extension, const char *default_name = NULL, wxWindow *parent = NULL); WXDLLEXPORT wxString wxLoadFileSelector(const char *what, const char *extension, const char *default_name = NULL, wxWindow *parent = NULL);
// Generic file save dialog // Generic file save dialog
char* WXDLLEXPORT wxSaveFileSelector(const char *what, const char *extension, const char *default_name = NULL, wxWindow *parent = NULL); WXDLLEXPORT wxString wxSaveFileSelector(const char *what, const char *extension, const char *default_name = NULL, wxWindow *parent = NULL);
*/
#endif #endif
// _WX_FILEDLG_H_ // _WX_FILEDLG_H_

4
include/wx/mac/setup.h
View File

@@ -30,12 +30,16 @@
// Level 1: wxDC, OnSize (etc.) compatibility, but // Level 1: wxDC, OnSize (etc.) compatibility, but
// some new features such as event tables // some new features such as event tables
#define wxUSE_AUTOTRANS 0
// Define wxTString
#define wxUSE_POSTSCRIPT 1 #define wxUSE_POSTSCRIPT 1
// 0 for no PostScript device context // 0 for no PostScript device context
#define wxUSE_AFM_FOR_POSTSCRIPT 0 #define wxUSE_AFM_FOR_POSTSCRIPT 0
// 1 to use font metric files in GetTextExtent // 1 to use font metric files in GetTextExtent
#define wxUSE_METAFILE 1 #define wxUSE_METAFILE 1
// 0 for no Metafile and metafile device context // 0 for no Metafile and metafile device context
#define wxUSE_FORM 0
// 0 for no wxForm
#define wxUSE_IPC 1 #define wxUSE_IPC 1
// 0 for no interprocess comms // 0 for no interprocess comms
#define wxUSE_HELP 1 #define wxUSE_HELP 1

2
include/wx/msw/setup.h
View File

@@ -22,7 +22,7 @@
#define _WX_GOODCOMPILER__ #define _WX_GOODCOMPILER__
// gcc can have problems, but Windows compilers // gcc can have problems, but Windows compilers
// are generally OK. // are generally OK.
#define WXWIN_COMPATIBILITY 0 #define WXWIN_COMPATIBILITY 1
// Compatibility with 1.68 API. // Compatibility with 1.68 API.
// Level 0: no backward compatibility, all new features // Level 0: no backward compatibility, all new features
// Level 1: Some compatibility. In fact // Level 1: Some compatibility. In fact

6
src/common/file.cpp
View File

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

2
src/common/fileconf.cpp
View File

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

3
src/common/gdicmn.cpp
View File

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

1171
src/mac/app.cpp
View File

File diff suppressed because it is too large Load Diff

1171
src/mac/carbon/app.cpp
View File

File diff suppressed because it is too large Load Diff

2
src/mac/carbon/data.cpp
View File

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

10
src/mac/carbon/filedlg.cpp
View File

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

3
src/mac/carbon/scrolbar.cpp
View File

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

3
src/mac/carbon/thread.cpp
View File

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

2
src/mac/data.cpp
View File

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

10
src/mac/filedlg.cpp
View File

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

3
src/mac/scrolbar.cpp
View File

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

3
src/mac/thread.cpp
View File

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

2
src/msw/app.cpp
View File

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