Fix GTK+ fullscreen issue

Fixed bugs:
  - https://launchpad.net/bugs/1529521

(bzr r14555)

4 files changed, 0 insertions, 13 deletions

diff --git a/src/inkview.cpp b/src/inkview.cpp
index 8b7492798..aab4b4a20 100644
--- a/src/inkview.cpp
+++ b/src/inkview.cpp
@@ -126,7 +126,6 @@ sp_svgview_main_key_press (GtkWidget */*widget*/, GdkEventKey *event, struct SPS
 	sp_svgview_goto_last(ss);
 	break;
     case GDK_KEY_F11:
-#ifdef HAVE_GTK_WINDOW_FULLSCREEN
 	if (ss->fullscreen) {
 	    gtk_window_unfullscreen (GTK_WINDOW(ss->window));
 	    ss->fullscreen = false;
@@ -134,9 +133,6 @@ sp_svgview_main_key_press (GtkWidget */*widget*/, GdkEventKey *event, struct SPS
 	    gtk_window_fullscreen (GTK_WINDOW(ss->window));
 	    ss->fullscreen = true;
 	}
-#else
-	std::cout<<"Your GTK+ does not support fullscreen mode. Upgrade to 2.2."<<std::endl;
-#endif
 	break;
     case GDK_KEY_Return:
 	sp_svgview_control_show (ss);
diff --git a/src/verbs.cpp b/src/verbs.cpp
index fd7eea2d5..a78bde2f7 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -1950,7 +1950,6 @@ void ZoomVerb::perform(SPAction *action, void *data)
         case SP_VERB_TOGGLE_GRID:
             dt->toggleGrids();
             break;
-#ifdef HAVE_GTK_WINDOW_FULLSCREEN
         case SP_VERB_FULLSCREEN:
             dt->fullscreen();
             break;
@@ -1958,7 +1957,6 @@ void ZoomVerb::perform(SPAction *action, void *data)
             dt->fullscreen();
             dt->focusMode(!dt->is_fullscreen());
             break;
-#endif // HAVE_GTK_WINDOW_FULLSCREEN
         case SP_VERB_FOCUSTOGGLE:
             dt->focusMode(!dt->is_focusMode());
             break;
@@ -2852,12 +2850,10 @@ Verb *Verb::_base_verbs[] = {
                  INKSCAPE_ICON("zoom-half-size")),
     new ZoomVerb(SP_VERB_ZOOM_2_1, "Zoom2:1", N_("_Zoom 2:1"), N_("Zoom to 2:1"),
                  INKSCAPE_ICON("zoom-double-size")),
-#ifdef HAVE_GTK_WINDOW_FULLSCREEN
     new ZoomVerb(SP_VERB_FULLSCREEN, "FullScreen", N_("_Fullscreen"), N_("Stretch this document window to full screen"),
                  INKSCAPE_ICON("view-fullscreen")),
     new ZoomVerb(SP_VERB_FULLSCREENFOCUS, "FullScreenFocus", N_("Fullscreen & Focus Mode"), N_("Stretch this document window to full screen"),
                  INKSCAPE_ICON("view-fullscreen")),
-#endif // HAVE_GTK_WINDOW_FULLSCREEN
     new ZoomVerb(SP_VERB_FOCUSTOGGLE, "FocusToggle", N_("Toggle _Focus Mode"), N_("Remove excess toolbars to focus on drawing"),
                  NULL),
     new ZoomVerb(SP_VERB_VIEW_NEW, "ViewNew", N_("Duplic_ate Window"), N_("Open a new window with the same document"),
diff --git a/src/verbs.h b/src/verbs.h
index e16acb2d1..4f453761e 100644
--- a/src/verbs.h
+++ b/src/verbs.h
@@ -19,7 +19,6 @@
 
 #include <cstring>
 #include <string>
-//#include "require-config.h"   /* HAVE_GTK_WINDOW_FULLSCREEN */
 #include <glibmm/ustring.h>
 
 struct SPAction;
@@ -262,10 +261,8 @@ enum {
     SP_VERB_ZOOM_1_1,
     SP_VERB_ZOOM_1_2,
     SP_VERB_ZOOM_2_1,
-#ifdef HAVE_GTK_WINDOW_FULLSCREEN
     SP_VERB_FULLSCREEN,
     SP_VERB_FULLSCREENFOCUS,
-#endif /* HAVE_GTK_WINDOW_FULLSCREEN */
     SP_VERB_FOCUSTOGGLE,
     SP_VERB_VIEW_NEW,
     SP_VERB_VIEW_NEW_PREVIEW,
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index da7a54ca0..1fdd3ca6d 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -1500,7 +1500,6 @@ sp_desktop_widget_maximize(SPDesktopWidget *dtw)
 void
 sp_desktop_widget_fullscreen(SPDesktopWidget *dtw)
 {
-#ifdef HAVE_GTK_WINDOW_FULLSCREEN
     GtkWindow *topw = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(dtw->canvas)));
     if (GTK_IS_WINDOW(topw)) {
         if (dtw->desktop->is_fullscreen()) {
@@ -1524,7 +1523,6 @@ sp_desktop_widget_fullscreen(SPDesktopWidget *dtw)
             // widget layout is triggered by the resulting window_state_event
         }
     }
-#endif /* HAVE_GTK_WINDOW_FULLSCREEN */
 }
 
 /**