/[svn]/gigedit/trunk/src/gigedit/dimregionchooser.h
ViewVC logotype

Diff of /gigedit/trunk/src/gigedit/dimregionchooser.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3363 by schoenebeck, Mon Jul 10 20:27:44 2017 UTC revision 3364 by schoenebeck, Tue Nov 14 18:07:25 2017 UTC
# Line 21  Line 21 
21  #define GIGEDIT_DIMREGIONCHOOSER_H  #define GIGEDIT_DIMREGIONCHOOSER_H
22    
23  #include <gtkmm/drawingarea.h>  #include <gtkmm/drawingarea.h>
 #include <gtkmm/uimanager.h>  
24  #include <gtkmm/menu.h>  #include <gtkmm/menu.h>
25  #include <gdkmm/window.h>  #include <gdkmm/window.h>
26    
# Line 33  Line 32 
32  # include <gig.h>  # include <gig.h>
33  #endif  #endif
34    
35    #if USE_GTKMM_BUILDER
36    # include <gtkmm/builder.h>
37    #else
38    # include <gtkmm/uimanager.h> // deprecated in gtkmm >= 3.21.4
39    #endif
40    
41  #include <set>  #include <set>
42  #include <map>  #include <map>
43    
# Line 74  protected: Line 79  protected:
79      virtual bool on_button_release_event(GdkEventButton* event);      virtual bool on_button_release_event(GdkEventButton* event);
80      virtual bool on_motion_notify_event(GdkEventMotion* event);      virtual bool on_motion_notify_event(GdkEventMotion* event);
81      virtual bool on_focus(Gtk::DirectionType direction);      virtual bool on_focus(Gtk::DirectionType direction);
82    #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && (GTKMM_MINOR_VERSION > 91 || (GTKMM_MINOR_VERSION == 91 && GTKMM_MICRO_VERSION >= 2))) // GTKMM >= 3.91.2
83        bool onKeyPressed(Gdk::EventKey& key);
84        bool onKeyReleased(Gdk::EventKey& key);
85    #else
86      bool onKeyPressed(GdkEventKey* key);      bool onKeyPressed(GdkEventKey* key);
87      bool onKeyReleased(GdkEventKey* key);      bool onKeyReleased(GdkEventKey* key);
88    #endif
89      void refresh_all();      void refresh_all();
90      void split_dimension_zone();      void split_dimension_zone();
91      void delete_dimension_zone();      void delete_dimension_zone();
# Line 145  protected: Line 155  protected:
155    
156      int h;      int h;
157    
158      Glib::RefPtr<Gtk::ActionGroup> actionGroup;      Glib::RefPtr<ActionGroup> actionGroup;
159    #if USE_GTKMM_BUILDER
160        Glib::RefPtr<Gtk::Builder> uiManager;
161    #else
162      Glib::RefPtr<Gtk::UIManager> uiManager;      Glib::RefPtr<Gtk::UIManager> uiManager;
163    #endif
164      Gtk::Menu* popup_menu_inside_dimregion;      Gtk::Menu* popup_menu_inside_dimregion;
165      Gtk::Menu* popup_menu_outside_dimregion;      Gtk::Menu* popup_menu_outside_dimregion;
166    
167  private:  private:
168      Glib::RefPtr<Gtk::Action> actionDeleteDimZone;      Glib::RefPtr<Action> actionDeleteDimZone;
169      Glib::RefPtr<Gtk::Action> actionSplitDimZone;      Glib::RefPtr<Action> actionSplitDimZone;
170  };  };
171    
172  #endif  #endif

Legend:
Removed from v.3363  
changed lines
  Added in v.3364

  ViewVC Help
Powered by ViewVC