Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

[wxWidgets.git] / src / gtk1 / dcmemory.cpp

diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp
index 3d865283d2d1af0feda66b0907ece00d1fe85bad..90b866b03480c1c3b40f4aa249d58285a3c88e6c 100644 (file)
--- a/src/gtk1/dcmemory.cpp
+++ b/src/gtk1/dcmemory.cpp
@@ -43,7 +43,7 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
     Destroy();
 
     m_selected = bitmap;
     Destroy();
 
     m_selected = bitmap;

-    if (m_selected.Ok())
+    if (m_selected.IsOk())

     {
         if (m_selected.GetPixmap())
         {
     {
         if (m_selected.GetPixmap())
         {


@@ -61,14 +61,14 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
     else
     {
         m_ok = false;
     else
     {
         m_ok = false;

-        m_window = (GdkWindow *) NULL;
+        m_window = NULL;

     }
 }
 
 void wxMemoryDCImpl::SetPen( const wxPen& penOrig )
 {
     wxPen pen( penOrig );
     }
 }
 
 void wxMemoryDCImpl::SetPen( const wxPen& penOrig )
 {
     wxPen pen( penOrig );

-    if ( m_selected.Ok() &&
+    if ( m_selected.IsOk() &&

             m_selected.GetBitmap() &&
                 (pen != *wxTRANSPARENT_PEN) )
     {
             m_selected.GetBitmap() &&
                 (pen != *wxTRANSPARENT_PEN) )
     {


@@ -81,7 +81,7 @@ void wxMemoryDCImpl::SetPen( const wxPen& penOrig )
 void wxMemoryDCImpl::SetBrush( const wxBrush& brushOrig )
 {
     wxBrush brush( brushOrig );
 void wxMemoryDCImpl::SetBrush( const wxBrush& brushOrig )
 {
     wxBrush brush( brushOrig );

-    if ( m_selected.Ok() &&
+    if ( m_selected.IsOk() &&

             m_selected.GetBitmap() &&
                 (brush != *wxTRANSPARENT_BRUSH) )
     {
             m_selected.GetBitmap() &&
                 (brush != *wxTRANSPARENT_BRUSH) )
     {


@@ -95,7 +95,7 @@ void wxMemoryDCImpl::SetBackground( const wxBrush& brushOrig )
 {
     wxBrush brush(brushOrig);
 
 {
     wxBrush brush(brushOrig);
 

-    if ( m_selected.Ok() &&
+    if ( m_selected.IsOk() &&

             m_selected.GetBitmap() &&
                 (brush != *wxTRANSPARENT_BRUSH) )
     {
             m_selected.GetBitmap() &&
                 (brush != *wxTRANSPARENT_BRUSH) )
     {


@@ -107,7 +107,7 @@ void wxMemoryDCImpl::SetBackground( const wxBrush& brushOrig )
 
 void wxMemoryDCImpl::SetTextForeground( const wxColour& col )
 {
 
 void wxMemoryDCImpl::SetTextForeground( const wxColour& col )
 {

-    if ( m_selected.Ok() && m_selected.GetBitmap() )
+    if ( m_selected.IsOk() && m_selected.GetBitmap() )

     {
         wxWindowDCImpl::SetTextForeground( col == *wxWHITE ? *wxBLACK : *wxWHITE);
     }
     {
         wxWindowDCImpl::SetTextForeground( col == *wxWHITE ? *wxBLACK : *wxWHITE);
     }


@@ -119,7 +119,7 @@ void wxMemoryDCImpl::SetTextForeground( const wxColour& col )
 
 void wxMemoryDCImpl::SetTextBackground( const wxColour &col )
 {
 
 void wxMemoryDCImpl::SetTextBackground( const wxColour &col )
 {

-    if (m_selected.Ok() && m_selected.GetBitmap())
+    if (m_selected.IsOk() && m_selected.GetBitmap())

     {
         wxWindowDCImpl::SetTextBackground( col == *wxWHITE ? *wxBLACK : *wxWHITE );
     }
     {
         wxWindowDCImpl::SetTextBackground( col == *wxWHITE ? *wxBLACK : *wxWHITE );
     }


@@ -131,7 +131,7 @@ void wxMemoryDCImpl::SetTextBackground( const wxColour &col )
 
 void wxMemoryDCImpl::DoGetSize( int *width, int *height ) const
 {
 
 void wxMemoryDCImpl::DoGetSize( int *width, int *height ) const
 {

-    if (m_selected.Ok())
+    if (m_selected.IsOk())

     {
         if (width) (*width) = m_selected.GetWidth();
         if (height) (*height) = m_selected.GetHeight();
     {
         if (width) (*width) = m_selected.GetWidth();
         if (height) (*height) = m_selected.GetHeight();