Fix history in wxWebViewIE when using a custom file scheme.

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

diff --git a/src/motif/dcmemory.cpp b/src/motif/dcmemory.cpp
index 7e3fa862da068121f1f60fa25c8954b9e7c909ff..72c64deea89e55be29a2a4432cf1fddd75cedc16 100644 (file)
--- a/src/motif/dcmemory.cpp
+++ b/src/motif/dcmemory.cpp
@@ -15,6 +15,8 @@
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/settings.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/settings.h"

+    #include "wx/dcmemory.h"
+    #include "wx/dcclient.h"

 #endif
 
 #ifdef __VMS__
 #endif
 
 #ifdef __VMS__


@@ -97,7 +99,7 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
         XFreeGC((Display*) m_display, (GC) m_gc);
     m_gc = (WXGC) NULL;
 
         XFreeGC((Display*) m_display, (GC) m_gc);
     m_gc = (WXGC) NULL;
 

-    if (m_bitmap.Ok() && (bitmap.GetDisplay() == m_display))
+    if (m_bitmap.IsOk() && (bitmap.GetDisplay() == m_display))

     {
         m_pixmap = m_bitmap.GetDrawable();
         Display* display = (Display*) m_display;
     {
         m_pixmap = m_bitmap.GetDrawable();
         Display* display = (Display*) m_display;


@@ -127,7 +129,7 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
 
 void wxMemoryDCImpl::DoGetSize( int *width, int *height ) const
 {
 
 void wxMemoryDCImpl::DoGetSize( int *width, int *height ) const
 {

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

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