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

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

@@ -55,6 +55,9 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
void wxStaticText::OnDraw( wxDC &dc )
{
if (m_width <= 0 || m_height <= 0)
return;
PrepareDC(dc);
dc.Clear() ;

6
src/mac/carbon/timer.cpp
View File

@@ -21,13 +21,13 @@ IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
static void wxProcessTimer( unsigned long event , void *data ) ;
pascal void MacTimerProc( TMTask * t )
static pascal void MacTimerProc( TMTask * t )
{
MacTimerInfo * tm = (MacTimerInfo*) t ;
wxMacAddEvent( tm->m_table , wxProcessTimer, 0 , (void*) tm->m_timer , TRUE ) ;
}
void wxProcessTimer( unsigned long event , void *data )
static void wxProcessTimer( unsigned long event , void *data )
{
if ( !data )
return ;
@@ -44,7 +44,7 @@ void wxProcessTimer( unsigned long event , void *data )
}
}
wxTimer::wxTimer()
void wxTimer::Init()
{
m_info.m_task.tmAddr = NULL ;
m_info.m_task.tmWakeUp = 0 ;

3
src/mac/stattext.cpp
View File

@@ -55,6 +55,9 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
void wxStaticText::OnDraw( wxDC &dc )
{
if (m_width <= 0 || m_height <= 0)
return;
PrepareDC(dc);
dc.Clear() ;

6
src/mac/timer.cpp
View File

@@ -21,13 +21,13 @@ IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
static void wxProcessTimer( unsigned long event , void *data ) ;
pascal void MacTimerProc( TMTask * t )
static pascal void MacTimerProc( TMTask * t )
{
MacTimerInfo * tm = (MacTimerInfo*) t ;
wxMacAddEvent( tm->m_table , wxProcessTimer, 0 , (void*) tm->m_timer , TRUE ) ;
}
void wxProcessTimer( unsigned long event , void *data )
static void wxProcessTimer( unsigned long event , void *data )
{
if ( !data )
return ;
@@ -44,7 +44,7 @@ void wxProcessTimer( unsigned long event , void *data )
}
}
wxTimer::wxTimer()
void wxTimer::Init()
{
m_info.m_task.tmAddr = NULL ;
m_info.m_task.tmWakeUp = 0 ;