Fix line indices translation in wxGrid::DoEndDragResizeLine().

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

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index cf37ab6b711115727566dbfe2dd1dfe1dc5fa7ab..5a77576b0a5e502426e33a55a69e94bb6b4ce52e 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -50,6 +50,10 @@
     #include <hildon-widgets/hildon-window.h>
 #endif // wxUSE_LIBHILDON
 
     #include <hildon-widgets/hildon-window.h>
 #endif // wxUSE_LIBHILDON
 

+#if wxUSE_LIBHILDON2
+    #include <hildon/hildon.h>
+#endif // wxUSE_LIBHILDON2
+

 // ----------------------------------------------------------------------------
 // data
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // data
 // ----------------------------------------------------------------------------


@@ -59,8 +63,8 @@ int wxOpenModalDialogsCount = 0;
 
 // the frame that is currently active (i.e. its child has focus). It is
 // used to generate wxActivateEvents
 
 // the frame that is currently active (i.e. its child has focus). It is
 // used to generate wxActivateEvents

-static wxTopLevelWindowGTK *g_activeFrame = (wxTopLevelWindowGTK*) NULL;
-static wxTopLevelWindowGTK *g_lastActiveFrame = (wxTopLevelWindowGTK*) NULL;
+static wxTopLevelWindowGTK *g_activeFrame = NULL;
+static wxTopLevelWindowGTK *g_lastActiveFrame = NULL;

 
 // if we detect that the app has got/lost the focus, we set this variable to
 // either TRUE or FALSE and an activate event will be sent during the next
 
 // if we detect that the app has got/lost the focus, we set this variable to
 // either TRUE or FALSE and an activate event will be sent during the next


@@ -354,6 +358,15 @@ gtk_frame_map_callback( GtkWidget*,
         eventShow.SetEventObject(win);
         win->GetEventHandler()->ProcessEvent(eventShow);
     }
         eventShow.SetEventObject(win);
         win->GetEventHandler()->ProcessEvent(eventShow);
     }

+
+#if GTK_CHECK_VERSION(2,6,0)
+    if (!gtk_check_version(2,6,0))
+    {
+        // restore focus-on-map setting in case ShowWithoutActivating() was called
+        gtk_window_set_focus_on_map(GTK_WINDOW(win->m_widget), true);
+    }
+#endif // GTK+ 2.6+
+

     return false;
 }
 }
     return false;
 }
 }


@@ -368,7 +381,9 @@ gtk_frame_unmap_callback( GtkWidget * WXUNUSED(widget),
                           GdkEvent * WXUNUSED(event),
                           wxTopLevelWindow *win )
 {
                           GdkEvent * WXUNUSED(event),
                           wxTopLevelWindow *win )
 {

-    win->SetIconizeState(true);
+    // hiding the window doesn't count as minimizing it
+    if (win->IsShown())
+        win->SetIconizeState(true);

     return false;
 }
 }
     return false;
 }
 }


@@ -416,13 +431,12 @@ static gboolean property_notify_event(
     static GdkAtom property = gdk_atom_intern("_NET_FRAME_EXTENTS", false);
     if (event->state == GDK_PROPERTY_NEW_VALUE && event->atom == property)
     {
     static GdkAtom property = gdk_atom_intern("_NET_FRAME_EXTENTS", false);
     if (event->state == GDK_PROPERTY_NEW_VALUE && event->atom == property)
     {

+        wxSize decorSize = win->m_decorSize;

         int left, right, top, bottom;
         if (wxGetFrameExtents(event->window, &left, &right, &top, &bottom))
         int left, right, top, bottom;
         if (wxGetFrameExtents(event->window, &left, &right, &top, &bottom))

-        {
-            const wxSize decorSize =
-                wxSize(left + right, top + bottom);
-            win->GTKUpdateDecorSize(decorSize);
-        }
+            decorSize.Set(left + right, top + bottom);
+
+        win->GTKUpdateDecorSize(decorSize);

     }
     return false;
 }
     }
     return false;
 }


@@ -434,7 +448,7 @@ static gboolean property_notify_event(
 
 void wxTopLevelWindowGTK::Init()
 {
 
 void wxTopLevelWindowGTK::Init()
 {

-    m_mainWidget = (GtkWidget*) NULL;
+    m_mainWidget = NULL;

     m_isIconized = false;
     m_fsIsShowing = false;
     m_themeEnabled = true;
     m_isIconized = false;
     m_fsIsShowing = false;
     m_themeEnabled = true;


@@ -442,6 +456,7 @@ void wxTopLevelWindowGTK::Init()
     m_gdkFunc = 0;
     m_grabbed = false;
     m_deferShow = true;
     m_gdkFunc = 0;
     m_grabbed = false;
     m_deferShow = true;

+    m_deferShowAllowed = true;

     m_updateDecorSize = true;
 
     m_urgency_hint = -2;
     m_updateDecorSize = true;
 
     m_urgency_hint = -2;


@@ -476,14 +491,14 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
     //     e.g. in wxTaskBarIconAreaGTK
     if (m_widget == NULL)
     {
     //     e.g. in wxTaskBarIconAreaGTK
     if (m_widget == NULL)
     {

-#if wxUSE_LIBHILDON
+#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2

         // we must create HildonWindow and not a normal GtkWindow as the latter
         // doesn't look correctly in Maemo environment and it must also be
         // registered with the main program object
         m_widget = hildon_window_new();
         hildon_program_add_window(wxTheApp->GetHildonProgram(),
                                   HILDON_WINDOW(m_widget));
         // we must create HildonWindow and not a normal GtkWindow as the latter
         // doesn't look correctly in Maemo environment and it must also be
         // registered with the main program object
         m_widget = hildon_window_new();
         hildon_program_add_window(wxTheApp->GetHildonProgram(),
                                   HILDON_WINDOW(m_widget));

-#else // !wxUSE_LIBHILDON
+#else // !wxUSE_LIBHILDON || !wxUSE_LIBHILDON2

         m_widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
         if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
         {
         m_widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
         if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
         {


@@ -510,7 +525,7 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
                 style |= wxFRAME_NO_TASKBAR;
             }
         }
                 style |= wxFRAME_NO_TASKBAR;
             }
         }

-#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON
+#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2/!wxUSE_LIBHILDON || !wxUSE_LIBHILDON2

 
         g_object_ref(m_widget);
     }
 
         g_object_ref(m_widget);
     }


@@ -533,6 +548,8 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
     {
         gtk_window_set_keep_above(GTK_WINDOW(m_widget), TRUE);
     }
     {
         gtk_window_set_keep_above(GTK_WINDOW(m_widget), TRUE);
     }

+    if (style & wxMAXIMIZE)
+        gtk_window_maximize(GTK_WINDOW(m_widget));

 
 #if 0
     if (!name.empty())
 
 #if 0
     if (!name.empty())


@@ -650,22 +667,22 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
 
 wxTopLevelWindowGTK::~wxTopLevelWindowGTK()
 {
 
 wxTopLevelWindowGTK::~wxTopLevelWindowGTK()
 {

-#if wxUSE_LIBHILDON
+#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2

     // it can also be a (standard) dialog
     if ( HILDON_IS_WINDOW(m_widget) )
     {
         hildon_program_remove_window(wxTheApp->GetHildonProgram(),
                                      HILDON_WINDOW(m_widget));
     }
     // it can also be a (standard) dialog
     if ( HILDON_IS_WINDOW(m_widget) )
     {
         hildon_program_remove_window(wxTheApp->GetHildonProgram(),
                                      HILDON_WINDOW(m_widget));
     }

-#endif // wxUSE_LIBHILDON
+#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2

 
     if (m_grabbed)
     {
 
     if (m_grabbed)
     {

-        wxFAIL_MSG(_T("Window still grabbed"));
+        wxFAIL_MSG(wxT("Window still grabbed"));

         RemoveGrab();
     }
 
         RemoveGrab();
     }
 

-    m_isBeingDeleted = true;
+    SendDestroyEvent();

 
     // it may also be GtkScrolledWindow in the case of an MDI child
     if (GTK_IS_WINDOW(m_widget))
 
     // it may also be GtkScrolledWindow in the case of an MDI child
     if (GTK_IS_WINDOW(m_widget))


@@ -776,6 +793,16 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long)
 // overridden wxWindow methods
 // ----------------------------------------------------------------------------
 
 // overridden wxWindow methods
 // ----------------------------------------------------------------------------
 

+void wxTopLevelWindowGTK::Refresh( bool WXUNUSED(eraseBackground), const wxRect *WXUNUSED(rect) )
+{
+    wxCHECK_RET( m_widget, wxT("invalid frame") );
+
+    gtk_widget_queue_draw( m_widget );
+
+    if (m_wxwindow && m_wxwindow->window)
+        gdk_window_invalidate_rect( m_wxwindow->window, NULL, TRUE );
+}
+

 bool wxTopLevelWindowGTK::Show( bool show )
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 bool wxTopLevelWindowGTK::Show( bool show )
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );


@@ -783,27 +810,34 @@ bool wxTopLevelWindowGTK::Show( bool show )
     bool deferShow = show && !m_isShown && m_deferShow;
     if (deferShow)
     {
     bool deferShow = show && !m_isShown && m_deferShow;
     if (deferShow)
     {

-        deferShow = false;
-        if (!GTK_WIDGET_REALIZED(m_widget) &&
-            g_signal_handler_find(m_widget,
+        deferShow = m_deferShowAllowed && !GTK_WIDGET_REALIZED(m_widget);
+        if (deferShow)
+        {
+            deferShow = g_signal_handler_find(m_widget,

                 GSignalMatchType(G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA),
                 g_signal_lookup("property_notify_event", GTK_TYPE_WIDGET),
                 GSignalMatchType(G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA),
                 g_signal_lookup("property_notify_event", GTK_TYPE_WIDGET),

-                0, NULL, NULL, this))
+                0, NULL, NULL, this) != 0;
+        }
+        GdkScreen* screen = NULL;
+        if (deferShow)

         {
         {

-            if (gdk_x11_screen_supports_net_wm_hint(
-                gtk_widget_get_screen(m_widget),
-                gdk_atom_intern("_NET_REQUEST_FRAME_EXTENTS", false)))
-            {
-                deferShow = true;
-            }
-            else
-            {
-                // Don't allow changes to m_decorSize, it breaks saving/restoring
-                // window size with GetSize()/SetSize() because it makes window
-                // bigger between each restore and save.
-                m_updateDecorSize = false;
-            }
+            screen = gtk_widget_get_screen(m_widget);
+            GdkAtom atom = gdk_atom_intern("_NET_REQUEST_FRAME_EXTENTS", false);
+            deferShow = gdk_x11_screen_supports_net_wm_hint(screen, atom) != 0;
+            // If _NET_REQUEST_FRAME_EXTENTS not supported, don't allow changes
+            // to m_decorSize, it breaks saving/restoring window size with
+            // GetSize()/SetSize() because it makes window bigger between each
+            // restore and save.
+            m_updateDecorSize = deferShow;
+        }
+        if (deferShow)
+        {
+            // Fluxbox support for _NET_REQUEST_FRAME_EXTENTS is broken
+            const char* name = gdk_x11_screen_get_window_manager_name(screen);
+            deferShow = strcmp(name, "Fluxbox") != 0;
+            m_updateDecorSize = deferShow;

         }
         }

+

         m_deferShow = deferShow;
     }
     if (deferShow)
         m_deferShow = deferShow;
     }
     if (deferShow)


@@ -855,7 +889,7 @@ bool wxTopLevelWindowGTK::Show( bool show )
         HandleWindowEvent(event);
     }
 
         HandleWindowEvent(event);
     }
 

-    bool change = wxTopLevelWindowBase::Show(show);
+    bool change = base_type::Show(show);

 
     if (change && !show)
     {
 
     if (change && !show)
     {


@@ -868,6 +902,19 @@ bool wxTopLevelWindowGTK::Show( bool show )
     return change;
 }
 
     return change;
 }
 

+void wxTopLevelWindowGTK::ShowWithoutActivating()
+{
+    if (!m_isShown)
+    {
+#if GTK_CHECK_VERSION(2,6,0)
+        if (!gtk_check_version(2,6,0))
+            gtk_window_set_focus_on_map(GTK_WINDOW(m_widget), false);
+#endif // GTK+ 2.6+
+
+        Show(true);
+    }
+}
+

 void wxTopLevelWindowGTK::Raise()
 {
     gtk_window_present( GTK_WINDOW( m_widget ) );
 void wxTopLevelWindowGTK::Raise()
 {
     gtk_window_present( GTK_WINDOW( m_widget ) );


@@ -888,14 +935,33 @@ void wxTopLevelWindowGTK::GTKDoGetSize(int *width, int *height) const
     size -= m_decorSize;
     if (size.x < 0) size.x = 0;
     if (size.y < 0) size.y = 0;
     size -= m_decorSize;
     if (size.x < 0) size.x = 0;
     if (size.y < 0) size.y = 0;

+#if wxUSE_LIBHILDON2
+    if (width) {
+       if (size.x == 720)
+               *width = 696;
+       else
+               *width = size.x;
+    }
+    if (height) {
+       if (size.y == 420)
+               *height = 396;
+       else if (size.y == 270)
+               *height = 246;
+            else
+               *height = size.y;
+    }
+#else // wxUSE_LIBHILDON2

     if (width)  *width  = size.x;
     if (height) *height = size.y;
     if (width)  *width  = size.x;
     if (height) *height = size.y;

+#endif // wxUSE_LIBHILDON2 /!wxUSE_LIBHILDON2

 }
 
 void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {
     wxCHECK_RET( m_widget, wxT("invalid frame") );
 
 }
 
 void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {
     wxCHECK_RET( m_widget, wxT("invalid frame") );
 

+    m_deferShowAllowed = true;
+

     // deal with the position first
     int old_x = m_x;
     int old_y = m_y;
     // deal with the position first
     int old_x = m_x;
     int old_y = m_y;


@@ -940,10 +1006,12 @@ void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int si
 
 void wxTopLevelWindowGTK::DoSetClientSize(int width, int height)
 {
 
 void wxTopLevelWindowGTK::DoSetClientSize(int width, int height)
 {

-    if (m_deferShow && !m_isShown)
-        // Since client size is being explicitly set, don't change it later
-        m_deferShow = false;
-    wxTopLevelWindowBase::DoSetClientSize(width, height);
+    base_type::DoSetClientSize(width, height);
+
+    // Since client size is being explicitly set, don't change it later
+    // Has to be done after calling base because it calls SetSize,
+    // which sets this true
+    m_deferShowAllowed = false;

 }
 
 void wxTopLevelWindowGTK::DoGetClientSize( int *width, int *height ) const
 }
 
 void wxTopLevelWindowGTK::DoGetClientSize( int *width, int *height ) const


@@ -969,7 +1037,7 @@ void wxTopLevelWindowGTK::DoSetSizeHints( int minW, int minH,
                                           int maxW, int maxH,
                                           int incW, int incH )
 {
                                           int maxW, int maxH,
                                           int incW, int incH )
 {

-    wxTopLevelWindowBase::DoSetSizeHints( minW, minH, maxW, maxH, incW, incH );
+    base_type::DoSetSizeHints(minW, minH, maxW, maxH, incW, incH);

 
     const wxSize minSize = GetMinSize();
     const wxSize maxSize = GetMaxSize();
 
     const wxSize minSize = GetMinSize();
     const wxSize maxSize = GetMaxSize();


@@ -1111,7 +1179,7 @@ void wxTopLevelWindowGTK::SetIcons( const wxIconBundle &icons )
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 

-    wxTopLevelWindowBase::SetIcons( icons );
+    base_type::SetIcons(icons);

 
     // Setting icons before window is realized can cause a GTK assertion if
     // another TLW is realized before this one, and it has this one as it's
 
     // Setting icons before window is realized can cause a GTK assertion if
     // another TLW is realized before this one, and it has this one as it's


@@ -1217,7 +1285,7 @@ static bool do_shape_combine_region(GdkWindow* window, const wxRegion& region)
 bool wxTopLevelWindowGTK::SetShape(const wxRegion& region)
 {
     wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false,
 bool wxTopLevelWindowGTK::SetShape(const wxRegion& region)
 {
     wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false,

-                 _T("Shaped windows must be created with the wxFRAME_SHAPED style."));
+                 wxT("Shaped windows must be created with the wxFRAME_SHAPED style."));

 
     if ( GTK_WIDGET_REALIZED(m_widget) )
     {
 
     if ( GTK_WIDGET_REALIZED(m_widget) )
     {


@@ -1247,10 +1315,11 @@ void wxTopLevelWindowGTK::RequestUserAttention(int flags)
     bool new_hint_value = false;
 
     // FIXME: This is a workaround to focus handling problem
     bool new_hint_value = false;
 
     // FIXME: This is a workaround to focus handling problem

-    // If RequestUserAttention is called for example right after a wxSleep, OnInternalIdle hasn't
-    // yet been processed, and the internal focus system is not up to date yet.
-    // wxYieldIfNeeded ensures the processing of it, but can have unwanted side effects - MR
-    ::wxYieldIfNeeded();
+    // If RequestUserAttention is called for example right after a wxSleep, OnInternalIdle
+    // hasn't yet been processed, and the internal focus system is not up to date yet.
+    // YieldFor(wxEVT_CATEGORY_UI) ensures the processing of it (hopefully it
+    // won't have side effects) - MR
+    wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_UI);

 
     if(m_urgency_hint >= 0)
         g_source_remove(m_urgency_hint);
 
     if(m_urgency_hint >= 0)
         g_source_remove(m_urgency_hint);


@@ -1352,7 +1421,7 @@ bool wxTopLevelWindowGTK::SetTransparent(wxByte alpha)
 bool wxTopLevelWindowGTK::CanSetTransparent()
 {
     // allow to override automatic detection as it's far from perfect
 bool wxTopLevelWindowGTK::CanSetTransparent()
 {
     // allow to override automatic detection as it's far from perfect

-    static const wxChar *SYSOPT_TRANSPARENT = wxT("gtk.tlw.can-set-transparent");
+    const wxString SYSOPT_TRANSPARENT = "gtk.tlw.can-set-transparent";

     if ( wxSystemOptions::HasOption(SYSOPT_TRANSPARENT) )
     {
         return wxSystemOptions::GetOptionInt(SYSOPT_TRANSPARENT) != 0;
     if ( wxSystemOptions::HasOption(SYSOPT_TRANSPARENT) )
     {
         return wxSystemOptions::GetOptionInt(SYSOPT_TRANSPARENT) != 0;