1. 26 Nov, 2013 1 commit
    • Tony's avatar
      mprove Gtk2/3 options in cmake · 69dc8405
      Tony authored
      Update to cmake files for to include minimum versions, and tidy up gtk operation.
      
      Files updated:
      CMakeLists.txt:
        WITH_GTK now uses Gtk3 by default. If not found then Gtk2 is used.
        WITH_GTK_2_X forces Gtk2.x use
      
      cmake/OpenCVFindLibsGUI.cmake
        Updated selection logic to implement methodology described above.
        Implemented warning if Gtk3 not found (and not overridden)
        Implemented error if Gtk does not meet minimum required version
      
      cmake/OpenCVMinDepVersions.cmake
        Added minimum Gtk version of 2.18.0
      69dc8405
  2. 15 Oct, 2013 1 commit
    • Tony's avatar
      Rework gtk3 window resize and draw cleanup · 5368f12b
      Tony authored
      The gtk3 resize functions fail to shrink the window after it has been
      resized. This edit changes this and allows the window to be shrunk
      back to its original size.
      
      This edit also cleans up the draw/expose functions.
      5368f12b
  3. 09 Oct, 2013 1 commit
    • Tony's avatar
      Code cleanup · d4df3739
      Tony authored
      Remove redundent #if defs from code
      d4df3739
  4. 04 Oct, 2013 1 commit
    • Tony's avatar
      Disable OpenGL when Gtk3 is selected · c1cd70e2
      Tony authored
      The OpenGL library is not supported on Gtk3 which uses the cairo
      library for rendering. Cairo, in turn uses hardware acceleration when
      supported by the underlying system. Some improvement to performance
      may be gained by useing the cairo-gl and cairo-glx libraries included
      on modern Gtk3 systems.
      
      See the cairo documentation for further information. The following
      link may also be of interest.
      
      http://lists.cairographics.org/archives/cairo/2012-October/023609.html
      c1cd70e2
  5. 02 Oct, 2013 1 commit
    • Tony's avatar
      These changes introduce Gtk3 support into the highgui module. · 81d6842b
      Tony authored
      A new option WITH_GTK3 has been added to the cmake configure system to enable compilation under Gtk version 3.The flag HAVE_GTK3 is also introduced to select the new Gtk3 code in the source files. (Gtk2 is disbled when Gtk3 is selected).
      
      window_gtk.cpp has been modified to remove obsolete (and deleted from libgtk 3) and introduce new Gtk3 code in its place when compiled for Gtk3.
      
      To compile for Gtk2, disable WITH_GTK3 in cmake. To build for Gtk3 both WITH_GTK and WITH_GTK3 must be selected.
      81d6842b
  6. 26 Sep, 2013 1 commit
    • Tony's avatar
      Replace obsolete Gtk symbols · 97fc1e10
      Tony authored
      This update replaces depreciated Gtk1.x symbols with Gtk2.x symbols in
      preparation for adding Gtk3 support. These edits aim to be fully
      compatible with Gtk2.x, allowing backward compatibility.
      
      The following symbols have been replaced in this commit:
      
      Gtk symbols that have been moved to the Gdk library:
       - GtkType -> Gtype
       - GTK_CHECK_CAST -> G_TYPE_CHECK_INSTANCE_CAST
       - GTK_CHECK_TYPE -> G_TYPE_CHECK_INSTANCE_TYPE
       - gtk_signal_connect -> g_signal_connect
       - GTK_SIGNAL_FUNC -> G_CALLBACK
       - gtk_type_class -> g_type_class_peek
       - gtk_type_new-> g_object_new
       - GtkTypeInfo -> GtypeInfo (Not required for
         g_type_register_static_simple)
       - gtk_type_unique -> g_type_register_static_simple
       - gdk_draw_image_rgb -> replaced by gdk_cairo_source_pixbuf
         NB: This requires porting to use cairo contexts and GdkPixbufs.
      
      The following gtk symbols are changed for their modern equivalent:
       - GTK_WIDGET_REALIZED -> gtk_widget_get_realized
       - GTK_OBJECT_FLAGS -> gtk_widget_set_realized
      
      Symbols without replacement:
       - gtk_range_set_update_policy -> No replacement; as default policy is
         set to continuous we can delete this line.
      97fc1e10
  7. 11 Sep, 2013 2 commits
  8. 10 Sep, 2013 7 commits
  9. 09 Sep, 2013 18 commits
  10. 07 Sep, 2013 1 commit
  11. 06 Sep, 2013 6 commits