mac fixes part II

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

diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp
index 119818f6c6b631efb09998ea6ec72878af26ff95..fbeccc565b2322528f35db7098a1fe6723913363 100644 (file)
--- a/src/mac/carbon/dc.cpp
+++ b/src/mac/carbon/dc.cpp
@@ -83,6 +83,10 @@ wxDC::wxDC()
        m_macClipRect.right = 32000 ;
        m_macClipRect.bottom = 32000 ;
        ::GetPort( &m_macOrigPort ) ;
        m_macClipRect.right = 32000 ;
        m_macClipRect.bottom = 32000 ;
        ::GetPort( &m_macOrigPort ) ;

+
+    m_pen = *wxBLACK_PEN;
+    m_font = *wxNORMAL_FONT;
+    m_brush = *wxWHITE_BRUSH;

 };
 
 wxDC::~wxDC(void)
 };
 
 wxDC::~wxDC(void)

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 5ce406a67a892724b25819345ffd63ab2fc85a34..a99f6c4e69f80a1bf7bae1e728add2c3d8252700 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -61,7 +61,7 @@ void wxStaticText::OnDraw( wxDC &dc )
         return;
 
     PrepareDC(dc);
         return;
 
     PrepareDC(dc);

-    dc.Clear() ;
+//    dc.Clear() ; this eventually draws in the wrong background colour (appearance panels)

     
     int x = 0 ;
     int y = 0 ;
     
     int x = 0 ;
     int y = 0 ;


@@ -259,7 +259,9 @@ void wxStaticText::SetLabel(const wxString& st )
        m_label = st ;
        if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
                SetSizeOrDefault() ;
        m_label = st ;
        if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
                SetSizeOrDefault() ;

-       
-    wxClientDC dc(this);
-    OnDraw( dc ) ;
+
+       Refresh() ;     
+       MacUpdateImmediately() ;
+//    wxClientDC dc(this);
+//    OnDraw( dc ) ;

 }
 }

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 28c069a63abecaa35c86c4e17391d770cd7f7884..b3137eaf09bc728a6524077a1feb72a9b9749a45 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -157,7 +157,8 @@ void wxDebugMsg(const char *fmt ...)
 
   vsprintf(buffer,fmt,ap) ;
   strcat(buffer,";g") ;
 
   vsprintf(buffer,fmt,ap) ;
   strcat(buffer,";g") ;

-  debugstr(buffer) ;
+  c2pstr(buffer) ;
+  DebugStr((unsigned char*) buffer) ;

 
   va_end(ap);
 }
 
   va_end(ap);
 }

diff --git a/src/mac/dc.cpp b/src/mac/dc.cpp
index 119818f6c6b631efb09998ea6ec72878af26ff95..fbeccc565b2322528f35db7098a1fe6723913363 100644 (file)
--- a/src/mac/dc.cpp
+++ b/src/mac/dc.cpp
@@ -83,6 +83,10 @@ wxDC::wxDC()
        m_macClipRect.right = 32000 ;
        m_macClipRect.bottom = 32000 ;
        ::GetPort( &m_macOrigPort ) ;
        m_macClipRect.right = 32000 ;
        m_macClipRect.bottom = 32000 ;
        ::GetPort( &m_macOrigPort ) ;

+
+    m_pen = *wxBLACK_PEN;
+    m_font = *wxNORMAL_FONT;
+    m_brush = *wxWHITE_BRUSH;

 };
 
 wxDC::~wxDC(void)
 };
 
 wxDC::~wxDC(void)

diff --git a/src/mac/stattext.cpp b/src/mac/stattext.cpp
index 5ce406a67a892724b25819345ffd63ab2fc85a34..a99f6c4e69f80a1bf7bae1e728add2c3d8252700 100644 (file)
--- a/src/mac/stattext.cpp
+++ b/src/mac/stattext.cpp
@@ -61,7 +61,7 @@ void wxStaticText::OnDraw( wxDC &dc )
         return;
 
     PrepareDC(dc);
         return;
 
     PrepareDC(dc);

-    dc.Clear() ;
+//    dc.Clear() ; this eventually draws in the wrong background colour (appearance panels)

     
     int x = 0 ;
     int y = 0 ;
     
     int x = 0 ;
     int y = 0 ;


@@ -259,7 +259,9 @@ void wxStaticText::SetLabel(const wxString& st )
        m_label = st ;
        if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
                SetSizeOrDefault() ;
        m_label = st ;
        if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
                SetSizeOrDefault() ;

-       
-    wxClientDC dc(this);
-    OnDraw( dc ) ;
+
+       Refresh() ;     
+       MacUpdateImmediately() ;
+//    wxClientDC dc(this);
+//    OnDraw( dc ) ;

 }
 }

diff --git a/src/mac/utils.cpp b/src/mac/utils.cpp
index 28c069a63abecaa35c86c4e17391d770cd7f7884..b3137eaf09bc728a6524077a1feb72a9b9749a45 100644 (file)
--- a/src/mac/utils.cpp
+++ b/src/mac/utils.cpp
@@ -157,7 +157,8 @@ void wxDebugMsg(const char *fmt ...)
 
   vsprintf(buffer,fmt,ap) ;
   strcat(buffer,";g") ;
 
   vsprintf(buffer,fmt,ap) ;
   strcat(buffer,";g") ;

-  debugstr(buffer) ;
+  c2pstr(buffer) ;
+  DebugStr((unsigned char*) buffer) ;

 
   va_end(ap);
 }
 
   va_end(ap);
 }