fix wxBitmapComboBox Gtk-CRITICAL assertion `GTK_IS_ENTRY (entry)' failed

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

diff --git a/include/wx/dcbuffer.h b/include/wx/dcbuffer.h
index 203f7cd1a38c93a7aef6be8c9718a7caf3fe71e2..40cb8179cd56863608d9e27a5d9f22556ddf1261 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())
-            SetLayoutDirection(dc->GetLayoutDirection());

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


@@ -138,8 +134,10 @@ private:
     // the buffering style
     int m_style;
 
     // the buffering style
     int m_style;
 

+    wxSize m_area;
+    

     DECLARE_DYNAMIC_CLASS(wxBufferedDC)
     DECLARE_DYNAMIC_CLASS(wxBufferedDC)

-    DECLARE_NO_COPY_CLASS(wxBufferedDC)
+    wxDECLARE_NO_COPY_CLASS(wxBufferedDC);

 };
 
 
 };
 
 


@@ -199,7 +197,7 @@ private:
     wxPaintDC m_paintdc;
 
     DECLARE_ABSTRACT_CLASS(wxBufferedPaintDC)
     wxPaintDC m_paintdc;
 
     DECLARE_ABSTRACT_CLASS(wxBufferedPaintDC)

-    DECLARE_NO_COPY_CLASS(wxBufferedPaintDC)
+    wxDECLARE_NO_COPY_CLASS(wxBufferedPaintDC);

 };
 
 
 };
 
 


@@ -216,9 +214,6 @@ private:
     #define wxAutoBufferedPaintDCBase           wxBufferedPaintDC
 #endif
 
     #define wxAutoBufferedPaintDCBase           wxBufferedPaintDC
 #endif
 

-
-#ifdef __WXDEBUG__
-

 class WXDLLIMPEXP_CORE wxAutoBufferedPaintDC : public wxAutoBufferedPaintDCBase
 {
 public:
 class WXDLLIMPEXP_CORE wxAutoBufferedPaintDC : public wxAutoBufferedPaintDCBase
 {
 public:


@@ -226,30 +221,18 @@ public:
     wxAutoBufferedPaintDC(wxWindow* win)
         : wxAutoBufferedPaintDCBase(win)
     {
     wxAutoBufferedPaintDC(wxWindow* win)
         : wxAutoBufferedPaintDCBase(win)
     {

-        TestWinStyle(win);
+        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."
+        );

     }
 
     virtual ~wxAutoBufferedPaintDC() { }
 
 private:
     }
 
     virtual ~wxAutoBufferedPaintDC() { }
 
 private:

-
-    void TestWinStyle(wxWindow* win)
-    {
-        // Help the user to get the double-buffering working properly.
-        wxASSERT_MSG( win->GetBackgroundStyle() == wxBG_STYLE_CUSTOM,
-                      wxT("In constructor, you need to call SetBackgroundStyle(wxBG_STYLE_CUSTOM), ")
-                      wxT("and also, if needed, paint the background manually in the paint event handler."));
-    }
-
-    DECLARE_NO_COPY_CLASS(wxAutoBufferedPaintDC)
+    wxDECLARE_NO_COPY_CLASS(wxAutoBufferedPaintDC);

 };
 
 };
 

-#else // !__WXDEBUG__
-
-// In release builds, just use typedef
-typedef wxAutoBufferedPaintDCBase wxAutoBufferedPaintDC;
-
-#endif

 
 
 // Check if the window is natively double buffered and will return a wxPaintDC
 
 
 // Check if the window is natively double buffered and will return a wxPaintDC