doing WakeUp in osx_carbon differently for the main event as well

[wxWidgets.git] / include / wx / dcbuffer.h

diff --git a/include/wx/dcbuffer.h b/include/wx/dcbuffer.h
index e5c45a8247f1c4ba56d5cc13b71b72b680c123f1..521113e0c815a89c5b0b3d7dec58e06e9bcf7061 100644 (file)
--- a/include/wx/dcbuffer.h
+++ b/include/wx/dcbuffer.h
@@ -112,14 +112,10 @@ private:
     // common part of Init()s
     void InitCommon(wxDC *dc, int style)
     {
     // common part of Init()s
     void InitCommon(wxDC *dc, int style)
     {

-        wxASSERT_MSG( !m_dc, _T("wxBufferedDC already initialised") );
+        wxASSERT_MSG( !m_dc, wxT("wxBufferedDC already initialised") );

 
         m_dc = dc;
         m_style = style;
 
         m_dc = dc;
         m_style = style;

-
-        // inherit the same layout direction as the original DC
-        if ( dc && dc->IsOk() )
-            CopyAttributes(*dc);

     }
 
     // check that the bitmap is valid and use it
     }
 
     // check that the bitmap is valid and use it


@@ -223,8 +219,8 @@ public:
     wxAutoBufferedPaintDC(wxWindow* win)
         : wxAutoBufferedPaintDCBase(win)
     {
     wxAutoBufferedPaintDC(wxWindow* win)
         : wxAutoBufferedPaintDCBase(win)
     {

-        wxASSERT_MSG( win->GetBackgroundStyle() == wxBG_STYLE_CUSTOM,
-            "You need to call SetBackgroundStyle(wxBG_STYLE_CUSTOM) in ctor, "
+        wxASSERT_MSG( win->GetBackgroundStyle() == wxBG_STYLE_PAINT,
+            "You need to call SetBackgroundStyle(wxBG_STYLE_PAINT) in ctor, "

             "and also, if needed, paint the background in wxEVT_PAINT handler."
         );
     }
             "and also, if needed, paint the background in wxEVT_PAINT handler."
         );
     }