/[svn]/gigedit/trunk/src/gigedit/gfx/builtinpix.cpp
ViewVC logotype

Diff of /gigedit/trunk/src/gigedit/gfx/builtinpix.cpp

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

revision 3363 by schoenebeck, Thu Jun 22 10:54:10 2017 UTC revision 3364 by schoenebeck, Tue Nov 14 18:07:25 2017 UTC
# Line 1  Line 1 
1  #include "builtinpix.h"  #include "builtinpix.h"
2    #include "../compat.h"
3    
4  Glib::RefPtr<Gdk::Pixbuf> redDot;  Glib::RefPtr<Gdk::Pixbuf> redDot;
5  Glib::RefPtr<Gdk::Pixbuf> yellowDot;  Glib::RefPtr<Gdk::Pixbuf> yellowDot;
# Line 42  void loadBuiltInPix() { Line 43  void loadBuiltInPix() {
43      if (*builtInPixMap[0].pixbuf) return;      if (*builtInPixMap[0].pixbuf) return;
44      const int n = sizeof(builtInPixMap) / sizeof(_BuiltInPixMap);      const int n = sizeof(builtInPixMap) / sizeof(_BuiltInPixMap);
45      for (int i = 0; i < n; ++i) {      for (int i = 0; i < n; ++i) {
46    # if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && (GTKMM_MINOR_VERSION > 89 || (GTKMM_MINOR_VERSION == 89 && GTKMM_MICRO_VERSION >= 2))) // GTKMM >= 3.89.2
47            GdkPixbuf* pPixbuf = gdk_pixbuf_new_from_inline(
48                builtInPixMap[i].size,
49                builtInPixMap[i].raw,
50                false,
51                NULL
52            );
53            *builtInPixMap[i].pixbuf = Glib::wrap(pPixbuf);
54    #else
55          *builtInPixMap[i].pixbuf = Gdk::Pixbuf::create_from_inline(          *builtInPixMap[i].pixbuf = Gdk::Pixbuf::create_from_inline(
56              builtInPixMap[i].size,              builtInPixMap[i].size,
57              builtInPixMap[i].raw              builtInPixMap[i].raw
58          );          );
59    #endif
60      }      }
61  }  }
Legend:
Removed from v.3363  
changed lines
  Added in v.3364
  ViewVC Help
Powered by ViewVC