Made SetFont for wxCheckListBox more intelligent.

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

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 5a676c5c1b51e304b2795506f71c3031c7df424d..93cb0f3c647acc87ddcae2cea7eff61b9d076b24 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -216,6 +216,12 @@ static long map_to_unmodified_wx_keysym( KeySym keysym )
         case GDK_Shift_R:       key_code = WXK_SHIFT;       break;
         case GDK_Control_L:
         case GDK_Control_R:     key_code = WXK_CONTROL;     break;
         case GDK_Shift_R:       key_code = WXK_SHIFT;       break;
         case GDK_Control_L:
         case GDK_Control_R:     key_code = WXK_CONTROL;     break;

+       case GDK_Meta_L:
+       case GDK_Meta_R:
+       case GDK_Alt_L:
+       case GDK_Alt_R:
+       case GDK_Super_L:
+       case GDK_Super_R:       key_code = WXK_ALT;         break;

         case GDK_Menu:          key_code = WXK_MENU;        break;
         case GDK_Help:          key_code = WXK_HELP;        break;
         case GDK_BackSpace:     key_code = WXK_BACK;        break;
         case GDK_Menu:          key_code = WXK_MENU;        break;
         case GDK_Help:          key_code = WXK_HELP;        break;
         case GDK_BackSpace:     key_code = WXK_BACK;        break;


@@ -1980,11 +1986,13 @@ void wxWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags )
         if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight;
 
         int border = 0;
         if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight;
 
         int border = 0;

+       int bottom_border = 0;

 
         if (GTK_WIDGET_CAN_DEFAULT(m_widget))
        {
            /* the default button has a border around it */
 
         if (GTK_WIDGET_CAN_DEFAULT(m_widget))
        {
            /* the default button has a border around it */

-           border = 5;
+           border = 6;
+           bottom_border = 5;

        }
 
        /* this is the result of hours of debugging: the following code
        }
 
        /* this is the result of hours of debugging: the following code


@@ -2013,7 +2021,7 @@ void wxWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags )
                              m_x-border, 
                              m_y-border,
                              m_width+2*border, 
                              m_x-border, 
                              m_y-border,
                              m_width+2*border, 

-                             m_height+2*border );
+                             m_height+border+bottom_border );

     }
 
     m_sizeSet = TRUE;
     }
 
     m_sizeSet = TRUE;


@@ -2030,10 +2038,14 @@ void wxWindow::OnInternalIdle()
     GdkWindow *window = GetConnectWidget()->window;
     if (window)
     {
     GdkWindow *window = GetConnectWidget()->window;
     if (window)
     {

-        if (g_globalCursor.Ok())
-           gdk_window_set_cursor( window, g_globalCursor.GetCursor() );
-        else
-           gdk_window_set_cursor( window, m_cursor.GetCursor() );
+        wxCursor cursor = m_cursor;
+        if (g_globalCursor.Ok()) cursor = g_globalCursor;
+       
+       if (m_currentGdkCursor != cursor)
+       {
+           gdk_window_set_cursor( window, cursor.GetCursor() );
+           m_currentGdkCursor = cursor;
+       }

     }
 
     UpdateWindowUI();
     }
 
     UpdateWindowUI();