gtkmm r965 - in branches/gtkmm-2-12: . demos/gtk-demo
- From: jjongsma svn gnome org
- To: svn-commits-list gnome org
- Subject: gtkmm r965 - in branches/gtkmm-2-12: . demos/gtk-demo
- Date: Tue, 19 Feb 2008 03:01:17 +0000 (GMT)
Author: jjongsma
Date: Tue Feb 19 03:01:16 2008
New Revision: 965
URL: http://svn.gnome.org/viewvc/gtkmm?rev=965&view=rev
Log:
patch by: Chris Wang <chris wang sun com>
* demos/gtk-demo/demowindow.cc:
* demos/gtk-demo/example_images.cc:
* demos/gtk-demo/example_pixbufs.cc:
* demos/gtk-demo/example_textview.cc: fix gtkmm demo program to be able to
find the source and image files when not run from the source directory
Modified:
branches/gtkmm-2-12/ChangeLog
branches/gtkmm-2-12/demos/gtk-demo/demowindow.cc
branches/gtkmm-2-12/demos/gtk-demo/example_images.cc
branches/gtkmm-2-12/demos/gtk-demo/example_pixbufs.cc
branches/gtkmm-2-12/demos/gtk-demo/example_textview.cc
Modified: branches/gtkmm-2-12/demos/gtk-demo/demowindow.cc
==============================================================================
--- branches/gtkmm-2-12/demos/gtk-demo/demowindow.cc (original)
+++ branches/gtkmm-2-12/demos/gtk-demo/demowindow.cc Tue Feb 19 03:01:16 2008
@@ -32,6 +32,7 @@
#include <cerrno>
#include <stdio.h>
#include <string.h>
+#include "demo-common.h"
#ifdef NEED_FLOCKFILE_PROTO
extern "C" void flockfile (FILE *);
@@ -277,7 +278,7 @@
FILE* file = fopen (filename.c_str(), "r");
if (!file)
{
- std::string installed = /* DEMOCODEDIR + G_DIR_SEPARATOR_S + */ filename;
+ std::string installed = demo_find_file(filename);
file = fopen (installed.c_str(), "r");
}
Modified: branches/gtkmm-2-12/demos/gtk-demo/example_images.cc
==============================================================================
--- branches/gtkmm-2-12/demos/gtk-demo/example_images.cc (original)
+++ branches/gtkmm-2-12/demos/gtk-demo/example_images.cc Tue Feb 19 03:01:16 2008
@@ -13,6 +13,7 @@
*/
#include <gtkmm.h>
+#include "demo-common.h"
class Example_Images : public Gtk::Window
{
@@ -71,7 +72,7 @@
m_Alignment_Image.add(m_Frame_Image);
m_VBox.pack_start(m_Alignment_Image, Gtk::PACK_SHRINK);
- Gtk::Image* pImage = Gtk::manage(new Gtk::Image("gtk-logo-rgb.gif"));
+ Gtk::Image* pImage = Gtk::manage(new Gtk::Image(demo_find_file("gtk-logo-rgb.gif")));
m_Frame_Image.add(*pImage);
/* Animation */
@@ -87,7 +88,7 @@
m_Alignment_Animation.add(m_Frame_Animation);
m_VBox.pack_start(m_Alignment_Animation, Gtk::PACK_SHRINK);
- pImage = Gtk::manage(new Gtk::Image("floppybuddy.gif"));
+ pImage = Gtk::manage(new Gtk::Image(demo_find_file("floppybuddy.gif")));
m_Frame_Animation.add(*pImage);
/* Progressive */
@@ -254,13 +255,13 @@
#ifdef GLIBMM_EXCEPTIONS_ENABLED
try
{
- m_image_stream = Glib::IOChannel::create_from_file("alphatest.png", "r");
+ m_image_stream = Glib::IOChannel::create_from_file(demo_find_file("alphatest.png"), "r");
}
catch(const Glib::Error& error)
{
#else
std::auto_ptr<Glib::Error> error;
- m_image_stream = Glib::IOChannel::create_from_file("alphatest.png", "r", error);
+ m_image_stream = Glib::IOChannel::create_from_file(demo_find_file("alphatest.png)", "r", error);
if(error.get())
{
#endif //GLIBMM_EXCEPTIONS_ENABLED
Modified: branches/gtkmm-2-12/demos/gtk-demo/example_pixbufs.cc
==============================================================================
--- branches/gtkmm-2-12/demos/gtk-demo/example_pixbufs.cc (original)
+++ branches/gtkmm-2-12/demos/gtk-demo/example_pixbufs.cc Tue Feb 19 03:01:16 2008
@@ -17,6 +17,7 @@
#include <gtkmm.h>
#include <stdlib.h>
#include <math.h>
+#include "demo-common.h"
#define FRAME_DELAY 50
@@ -109,10 +110,10 @@
std::string filename_background = BACKGROUND_NAME;
#ifdef GLIBMM_EXCEPTIONS_ENABLED
- m_refPixbuf_Background = Gdk::Pixbuf::create_from_file(filename_background);
+ m_refPixbuf_Background = Gdk::Pixbuf::create_from_file(demo_find_file(filename_background));
#else
std::auto_ptr<Glib::Error> error;
- m_refPixbuf_Background = Gdk::Pixbuf::create_from_file(filename_background, error);
+ m_refPixbuf_Background = Gdk::Pixbuf::create_from_file(demo_find_file(filename_background), error);
#endif //GLIBMM_EXCEPTIONS_ENABLED
m_back_width = m_refPixbuf_Background->get_width();
@@ -123,10 +124,10 @@
std::string filename = image_names[i];
#ifdef GLIBMM_EXCEPTIONS_ENABLED
- Glib::RefPtr<Gdk::Pixbuf> pixbuf = Gdk::Pixbuf::create_from_file(filename);
+ Glib::RefPtr<Gdk::Pixbuf> pixbuf = Gdk::Pixbuf::create_from_file(demo_find_file(filename));
#else
std::auto_ptr<Glib::Error> error;
- Glib::RefPtr<Gdk::Pixbuf> pixbuf = Gdk::Pixbuf::create_from_file(filename, error);
+ Glib::RefPtr<Gdk::Pixbuf> pixbuf = Gdk::Pixbuf::create_from_file(demo_find_file(filename), error);
#endif //GLIBMM_EXCEPTIONS_ENABLED
m_images[i] = pixbuf;
Modified: branches/gtkmm-2-12/demos/gtk-demo/example_textview.cc
==============================================================================
--- branches/gtkmm-2-12/demos/gtk-demo/example_textview.cc (original)
+++ branches/gtkmm-2-12/demos/gtk-demo/example_textview.cc Tue Feb 19 03:01:16 2008
@@ -10,6 +10,7 @@
#include "gtkmm.h"
#include "gtk/gtkstock.h"
#include "gtk/gtk.h"
+#include "demo-common.h"
class Window_EasterEgg : public Gtk::Window
{
@@ -237,10 +238,10 @@
void Example_TextView::insert_text(Glib::RefPtr<Gtk::TextBuffer>& refBuffer)
{
#ifdef GLIBMM_EXCEPTIONS_ENABLED
- Glib::RefPtr<Gdk::Pixbuf> refPixbuf = Gdk::Pixbuf::create_from_file("./gtk-logo-rgb.gif");
+ Glib::RefPtr<Gdk::Pixbuf> refPixbuf = Gdk::Pixbuf::create_from_file(demo_find_file("gtk-logo-rgb.gif"));
#else
std::auto_ptr<Glib::Error> error;
- Glib::RefPtr<Gdk::Pixbuf> refPixbuf = Gdk::Pixbuf::create_from_file("./gtk-logo-rgb.gif", error);
+ Glib::RefPtr<Gdk::Pixbuf> refPixbuf = Gdk::Pixbuf::create_from_file(demo_find_file("gtk-logo-rgb.gif"), error);
#endif //GLIBMM_EXCEPTIONS_ENABLED
if(!refPixbuf)
@@ -474,7 +475,7 @@
}
else if (i == 3)
{
- pWidget = Gtk::manage( new Gtk::Image("./floppybuddy.gif") );
+ pWidget = Gtk::manage( new Gtk::Image(demo_find_file("floppybuddy.gif")) );
}
else if (i == 4)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]