added an error message if a bitmap can't be addedto the image list

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

diff --git a/src/motif/dcscreen.cpp b/src/motif/dcscreen.cpp
index ac4344498e89d4c4864cf6af54753ab01a2959f8..cdb5ed5dd43cc547c67dafbe609c991998987e67 100644 (file)
--- a/src/motif/dcscreen.cpp
+++ b/src/motif/dcscreen.cpp
@@ -47,9 +47,10 @@ wxScreenDC::wxScreenDC()
   gcvalues.foreground = BlackPixel (display, DefaultScreen (display));
   gcvalues.background = WhitePixel (display, DefaultScreen (display));
   gcvalues.graphics_exposures = False;
   gcvalues.foreground = BlackPixel (display, DefaultScreen (display));
   gcvalues.background = WhitePixel (display, DefaultScreen (display));
   gcvalues.graphics_exposures = False;

+  gcvalues.subwindow_mode = IncludeInferiors;

   gcvalues.line_width = 1;
   m_gc = XCreateGC (display, RootWindow (display, DefaultScreen (display)),
   gcvalues.line_width = 1;
   m_gc = XCreateGC (display, RootWindow (display, DefaultScreen (display)),

-           GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth,
+           GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,

                  &gcvalues);
 
   m_backgroundPixel = (int) gcvalues.background;
                  &gcvalues);
 
   m_backgroundPixel = (int) gcvalues.background;


@@ -65,7 +66,8 @@ bool wxScreenDC::StartDrawingOnTop(wxWindow* window)
   wxRect rect;
   int x, y, width, height;
   window->GetPosition(& x, & y);
   wxRect rect;
   int x, y, width, height;
   window->GetPosition(& x, & y);

-  window->ClientToScreen(& x, & y);
+  if (window->GetParent())
+      window->GetParent()->ClientToScreen(& x, & y);

   window->GetSize(& width, & height);
   rect.x = x; rect.y = y;
   rect.width = width; rect.height = height;
   window->GetSize(& width, & height);
   rect.x = x; rect.y = y;
   rect.width = width; rect.height = height;