From: Taybin Rutkin <taybin@taybin.com>
Date: Wed, 7 Dec 2005 16:23:58 +0000 (+0000)
Subject: Removed last usage of checkmark XPMs.
X-Git-Tag: 2.0beta4~551
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=e21dc7dede5ee5494925e2ae641b7a69b41dc2d7;p=ardour.git

Removed last usage of checkmark XPMs.


git-svn-id: svn://localhost/trunk/ardour2@177 d708f5d6-7413-0410-9779-e7cbd77b26cf
---

diff --git a/gtk2_ardour/check_mark.h b/gtk2_ardour/check_mark.h
deleted file mode 100644
index 78f7424028..0000000000
--- a/gtk2_ardour/check_mark.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-    Copyright (C) 2000 Paul Davis 
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-static const gchar* check_xpm[] = {
-"13 10 3 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"          .. ",
-" ++++++++.++.",
-" +      .++. ",
-" +.    .++.+ ",
-" .+.  .++. + ",
-".+++..++.  + ",
-" .+++++.   + ",
-" +.+++.    + ",
-" ++.+.++++++ ",
-"    .        "};
-
-static const gchar* empty_xpm[] = {
-"13 10 2 1",
-" 	c None",
-"+  c #FFFFFF",
-"             ",
-" +++++++++++ ",
-" +         + ",
-" +         + ",
-" +         + ",
-" +         + ",
-" +         + ",
-" +         + ",
-" +++++++++++ ",
-"             ",};
-
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 099ee43cb2..cde3e0cf45 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -48,7 +48,6 @@
 #include <ardour/utils.h>
 
 #include "ardour_ui.h"
-#include "check_mark.h"
 #include "editor.h"
 #include "grouped_buttons.h"
 #include "keyboard.h"
@@ -145,15 +144,9 @@ Gdk::Cursor* Editor::zoom_cursor = 0;
 Gdk::Cursor* Editor::time_fx_cursor = 0;
 Gdk::Cursor* Editor::fader_cursor = 0;
 Gdk::Cursor* Editor::speaker_cursor = 0;
-Gdk::Cursor* Editor::null_cursor = 0;
 Gdk::Cursor* Editor::wait_cursor = 0;
 Gdk::Cursor* Editor::timebar_cursor = 0;
 
-GdkPixmap *Editor::check_pixmap = 0;
-GdkBitmap *Editor::check_mask = 0;
-GdkPixmap *Editor::empty_pixmap = 0;
-GdkBitmap *Editor::empty_mask = 0;
-
 Editor::Editor (AudioEngine& eng) 
 	: engine (eng),
 
@@ -219,13 +212,6 @@ Editor::Editor (AudioEngine& eng)
 
 	init_colormap ();
 
-	check_pixmap = gdk_pixmap_colormap_create_from_xpm_d (NULL, 
-							      gtk_widget_get_colormap (GTK_WIDGET(edit_group_list.gobj())),
-							      &check_mask, NULL, (gchar **) check_xpm);
-	empty_pixmap = gdk_pixmap_colormap_create_from_xpm_d (NULL, 
-							      gtk_widget_get_colormap (GTK_WIDGET(edit_group_list.gobj())),
-							      &empty_mask, NULL, (gchar **) empty_xpm);
-
 	session = 0;
 
 	selection = new Selection;
@@ -994,12 +980,6 @@ Editor::on_realize ()
 
 	track_context_menu.accelerate (*this->get_toplevel());
 	track_region_context_menu.accelerate (*this->get_toplevel());
-	
-        Glib::RefPtr<Gdk::Pixmap> empty_pixmap = Gdk::Pixmap::create(get_window(), 1, 1, 1);
-	Glib::RefPtr<Gdk::Pixmap> empty_bitmap = Gdk::Pixmap::create(get_window(), 1, 1, 1);
-	Gdk::Color white ("#ffffff" );
-
-	null_cursor = new Gdk::Cursor(empty_pixmap, empty_bitmap, white, white, 0, 0);
 }
 
 
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 547bca13ae..67d92360bc 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -794,7 +794,6 @@ class Editor : public PublicEditor
 	static Gdk::Cursor* time_fx_cursor;
 	static Gdk::Cursor* fader_cursor;
 	static Gdk::Cursor* speaker_cursor;
-	static Gdk::Cursor* null_cursor;
 	static Gdk::Cursor* wait_cursor;
 	static Gdk::Cursor* timebar_cursor;
 
@@ -1528,11 +1527,6 @@ class Editor : public PublicEditor
 
 	Gtk::VBox           list_vpacker;
 
-	static GdkPixmap* check_pixmap;
-	static GdkBitmap* check_mask;
-	static GdkPixmap* empty_pixmap;
-	static GdkBitmap* empty_mask;
-
 	/* autoscrolling */
 
 	int autoscroll_timeout_tag;