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

mac fixes part II

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2001-05-08 11:49:20 +00:00
parent ab85e6cd00
commit 9ff647cf66
6 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mac/carbon/dc.cpp
View File

@@ -83,6 +83,10 @@ wxDC::wxDC()
m_macClipRect.right = 32000 ; m_macClipRect.right = 32000 ;
m_macClipRect.bottom = 32000 ; m_macClipRect.bottom = 32000 ;
::GetPort( &m_macOrigPort ) ; ::GetPort( &m_macOrigPort ) ;
m_pen = *wxBLACK_PEN;
m_font = *wxNORMAL_FONT;
m_brush = *wxWHITE_BRUSH;
}; };
wxDC::~wxDC(void) wxDC::~wxDC(void)

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

@@ -61,7 +61,7 @@ void wxStaticText::OnDraw( wxDC &dc )
return; return;
PrepareDC(dc); PrepareDC(dc);
dc.Clear() ; // dc.Clear() ; this eventually draws in the wrong background colour (appearance panels)
int x = 0 ; int x = 0 ;
int y = 0 ; int y = 0 ;
@@ -260,6 +260,8 @@ void wxStaticText::SetLabel(const wxString& st )
if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) ) if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
SetSizeOrDefault() ; SetSizeOrDefault() ;
wxClientDC dc(this); Refresh() ;
OnDraw( dc ) ; MacUpdateImmediately() ;
// wxClientDC dc(this);
// OnDraw( dc ) ;
} }

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

@@ -157,7 +157,8 @@ void wxDebugMsg(const char *fmt ...)
vsprintf(buffer,fmt,ap) ; vsprintf(buffer,fmt,ap) ;
strcat(buffer,";g") ; strcat(buffer,";g") ;
debugstr(buffer) ; c2pstr(buffer) ;
DebugStr((unsigned char*) buffer) ;
va_end(ap); va_end(ap);
} }

4
src/mac/dc.cpp
View File

@@ -83,6 +83,10 @@ wxDC::wxDC()
m_macClipRect.right = 32000 ; m_macClipRect.right = 32000 ;
m_macClipRect.bottom = 32000 ; m_macClipRect.bottom = 32000 ;
::GetPort( &m_macOrigPort ) ; ::GetPort( &m_macOrigPort ) ;
m_pen = *wxBLACK_PEN;
m_font = *wxNORMAL_FONT;
m_brush = *wxWHITE_BRUSH;
}; };
wxDC::~wxDC(void) wxDC::~wxDC(void)

8
src/mac/stattext.cpp
View File

@@ -61,7 +61,7 @@ void wxStaticText::OnDraw( wxDC &dc )
return; return;
PrepareDC(dc); PrepareDC(dc);
dc.Clear() ; // dc.Clear() ; this eventually draws in the wrong background colour (appearance panels)
int x = 0 ; int x = 0 ;
int y = 0 ; int y = 0 ;
@@ -260,6 +260,8 @@ void wxStaticText::SetLabel(const wxString& st )
if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) ) if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
SetSizeOrDefault() ; SetSizeOrDefault() ;
wxClientDC dc(this); Refresh() ;
OnDraw( dc ) ; MacUpdateImmediately() ;
// wxClientDC dc(this);
// OnDraw( dc ) ;
} }

3
src/mac/utils.cpp
View File

@@ -157,7 +157,8 @@ void wxDebugMsg(const char *fmt ...)
vsprintf(buffer,fmt,ap) ; vsprintf(buffer,fmt,ap) ;
strcat(buffer,";g") ; strcat(buffer,";g") ;
debugstr(buffer) ; c2pstr(buffer) ;
DebugStr((unsigned char*) buffer) ;
va_end(ap); va_end(ap);
} }