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

added cw6 fixes and patrick's patches

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2000-12-10 10:17:00 +00:00
parent de20db997d
commit d015713e78
11 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/gdicmn.h
View File

@@ -167,7 +167,7 @@ enum wxStockCursor
#if defined(__WXMSW__) || defined(__WXPM__)
#define wxBITMAP(name) wxBitmap(#name, wxBITMAP_TYPE_RESOURCE)
#elif defined(__WXGTK__) || defined(__WXMOTIF__)
#elif defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
// Initialize from an included XPM
#define wxBITMAP(name) wxBitmap( (const char**) name##_xpm )
#else // other platforms

6
include/wx/mac/timer.h
View File

@@ -31,7 +31,8 @@ typedef struct MacTimerInfo
class WXDLLEXPORT wxTimer: public wxTimerBase
{
public:
wxTimer();
wxTimer() { Init(); }
wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id) { Init(); }
~wxTimer();
virtual bool Start(int milliseconds = -1,
@@ -41,7 +42,10 @@ public:
virtual bool IsRunning() const ;
MacTimerInfo m_info;
protected :
void Init();
private:
DECLARE_ABSTRACT_CLASS(wxTimer)
};

4
include/wx/wx_cw.h
View File

@@ -12,6 +12,10 @@
#ifndef _WX_CW__
#define _WX_CW__
#if __MWERKS__ >= 0x2400
#pragma old_argmatch on
#endif
#if __option(profile)
#ifdef __cplusplus
#if __POWERPC__

4
include/wx/wx_cw_cm.h
View File

@@ -6,6 +6,10 @@
#define WX_COMP_INLINE_NO_CLASS // defined if the compiler does not want the classname repeated for inlines within a class definition
#if __MWERKS__ >= 0x2400
#pragma old_argmatch on
#endif
#if (__MWERKS__ < 0x0900) || macintosh
#define __MAC__
#define __WXMAC__

4
include/wx/wx_cw_d.h
View File

@@ -12,6 +12,10 @@
#ifndef _WX_CW__
#define _WX_CW__
#if __MWERKS__ >= 0x2400
#pragma old_argmatch on
#endif
#if __option(profile)
#error "profiling is not supported in debug versions"
#else

4
include/wx/wx_cwc.h
View File

@@ -12,6 +12,10 @@
#ifndef _WX_CW__
#define _WX_CW__
#if __MWERKS__ >= 0x2400
#pragma old_argmatch on
#endif
#if __option(profile)
#ifdef __cplusplus
#if __POWERPC__

4
include/wx/wx_cwc_d.h
View File

@@ -12,6 +12,10 @@
#ifndef _WX_CW__
#define _WX_CW__
#if __MWERKS__ >= 0x2400
#pragma old_argmatch on
#endif
#if __option(profile)
#error "profiling is not supported in debug versions"
#else