Implemented tearoff menus, please see my posting to wxwin-developers.

[wxWidgets.git] / src / gtk / dcclient.cpp

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index dd1751a16dfcd3755d4aea059b1d3fc0ec72f061..649070a9158a46b50ce35c445021f50d671d6fd8 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -111,11 +111,11 @@ wxWindowDC::wxWindowDC( wxWindow *window )
     m_owner = (wxWindow *)NULL;
     m_isMemDC = FALSE;
   
     m_owner = (wxWindow *)NULL;
     m_isMemDC = FALSE;
   

-    wxASSERT_MSG( window, "DC needs a window" );
+    wxASSERT_MSG( window, _T("DC needs a window") );

     
     GtkWidget *widget = window->m_wxwindow;
     
     
     GtkWidget *widget = window->m_wxwindow;
     

-    wxASSERT_MSG( widget, "DC needs a widget" );
+    wxASSERT_MSG( widget, _T("DC needs a widget") );

     
     m_window = widget->window;
     
     
     m_window = widget->window;
     


@@ -1025,7 +1025,7 @@ void wxWindowDC::SetLogicalFunction( int function )
 #endif
         default:
        {
 #endif
         default:
        {

-          wxFAIL_MSG( "unsupported logical function" );
+          wxFAIL_MSG( _T("unsupported logical function") );

           break;
        }
     }
           break;
        }
     }


@@ -1172,9 +1172,15 @@ void wxWindowDC::SetUpDC()
     m_brush = wxNullBrush;
     SetBrush( tmp_brush );
     
     m_brush = wxNullBrush;
     SetBrush( tmp_brush );
     

+/*

     tmp_brush = m_backgroundBrush;
     m_backgroundBrush = wxNullBrush;
     SetBackground( tmp_brush );
     tmp_brush = m_backgroundBrush;
     m_backgroundBrush = wxNullBrush;
     SetBackground( tmp_brush );

+*/
+    tmp_brush = m_backgroundBrush;
+    m_backgroundBrush = wxNullBrush;
+    SetBackground( *wxWHITE_BRUSH );
+    m_backgroundBrush = tmp_brush;

   
     if (!hatch_bitmap) 
     {
   
     if (!hatch_bitmap) 
     {