In bitmap.cpp, CreateFromImage, took GetWidth and GetHeight out of loop.

Fixed wxWindowX11::FindFocus so text selections work again.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp
index 214d4554f7c20f5a31786a995ec1b8e07564ec12..31fd1858f0c766e61d22a855df0eb3cbaf08795f 100644 (file)
--- a/src/x11/bitmap.cpp
+++ b/src/x11/bitmap.cpp
@@ -150,11 +150,13 @@ bool wxMask::Create( const wxBitmap& bitmap,
 
     XSetForeground( xdisplay, gc, BlackPixel(xdisplay,xscreen) );
 
 
     XSetForeground( xdisplay, gc, BlackPixel(xdisplay,xscreen) );
 

-    for (int j = 0; j < image.GetHeight(); j++)
+    int width = image.GetWidth();
+    int height = image.GetHeight();
+    for (int j = 0; j < height; j++)

     {
         int start_x = -1;
         int i;
     {
         int start_x = -1;
         int i;

-        for (i = 0; i < image.GetWidth(); i++)
+        for (i = 0; i < width; i++)

         {
             if ((data[index] == red) &&
                 (data[index+1] == green) &&
         {
             if ((data[index] == red) &&
                 (data[index+1] == green) &&


@@ -906,10 +908,12 @@ wxImage wxBitmap::ConvertToImage() const
 
 //    GdkColormap *cmap = gtk_widget_get_default_colormap();
 
 
 //    GdkColormap *cmap = gtk_widget_get_default_colormap();
 

+    int width = GetWidth();
+    int height = GetHeight();

     long pos = 0;
     long pos = 0;

-    for (int j = 0; j < GetHeight(); j++)
+    for (int j = 0; j < height; j++)

     {
     {

-        for (int i = 0; i < GetWidth(); i++)
+        for (int i = 0; i < width; i++)

         {
             unsigned long pixel = XGetPixel( x_image, i, j );
             if (bpp == 1)
         {
             unsigned long pixel = XGetPixel( x_image, i, j );
             if (bpp == 1)

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index ecd62930889dc2023ffd0a0bd040eae703524bc3..18aad1d21288deed199a117eabd156c1565e6132 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -379,6 +379,10 @@ wxWindow *wxWindowBase::FindFocus()
     if (xfocus)
     {
         wxWindow *win = wxGetWindowFromTable( xfocus );
     if (xfocus)
     {
         wxWindow *win = wxGetWindowFromTable( xfocus );

+        if (!win)
+        {
+            win = wxGetClientWindowFromTable( xfocus );
+        }

 
         return win;
     }
 
         return win;
     }


@@ -901,7 +905,7 @@ void wxWindowX11::DoMoveWindow(int x, int y, int width, int height)
             width -= size.x;
         }
         
             width -= size.x;
         }
         

-        XMoveResizeWindow( wxGlobalDisplay(), xwindow, x, y, width, height );
+        XMoveResizeWindow( wxGlobalDisplay(), xwindow, x, y, wxMax(1, width), wxMax(1, height) );

     }
     
 #else    
     }
     
 #else