summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorNick Mainsbridge <beatroute@iprimus.com.au>2005-12-02 09:20:03 +0000
committerNick Mainsbridge <beatroute@iprimus.com.au>2005-12-02 09:20:03 +0000
commit7aee3d6fbf0fedc8c34def2461fc8064d2cc654c (patch)
treea7504b090eda0955f5579bd7c3c730cd825ddbe7 /gtk2_ardour
parent4cc6d157ec047c877f6cf4cd47530dbfa342e8bf (diff)
get SYSLIBS=1 kind of working, use stock HAND2 cursor
git-svn-id: svn://localhost/trunk/ardour2@159 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/editor.cc23
-rw-r--r--gtk2_ardour/editor_xpms17
2 files changed, 7 insertions, 33 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 62655bff13..58c42d3cba 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -1403,16 +1403,6 @@ void
Editor::build_cursors ()
{
using namespace Gdk;
-
- Gdk::Color fg ("#ff0000"); /* Red. */
- Gdk::Color bg ("#0000ff"); /* Blue. */
-
- {
- RefPtr<Bitmap> source, mask;
- source = Bitmap::create (hand_bits, hand_width, hand_height);
- mask = Bitmap::create (handmask_bits, handmask_width, handmask_height);
- grabber_cursor = new Gdk::Cursor (source, mask, fg, bg, hand_x_hot, hand_y_hot);
- }
Gdk::Color mbg ("#000000" ); /* Black */
Gdk::Color mfg ("#0000ff" ); /* Blue. */
@@ -1442,12 +1432,13 @@ Editor::build_cursors ()
speaker_cursor = new Gdk::Cursor (source, mask, ffg, fbg, speaker_cursor_x_hot, speaker_cursor_y_hot);
}
- cross_hair_cursor = new Gdk::Cursor (Gdk::CROSSHAIR);
- trimmer_cursor = new Gdk::Cursor (Gdk::SB_H_DOUBLE_ARROW);
- selector_cursor = new Gdk::Cursor (Gdk::XTERM);
- time_fx_cursor = new Gdk::Cursor (Gdk::SIZING);
- wait_cursor = new Gdk::Cursor (Gdk::WATCH);
- timebar_cursor = new Gdk::Cursor(Gdk::LEFT_PTR);
+ grabber_cursor = new Gdk::Cursor (HAND2);
+ cross_hair_cursor = new Gdk::Cursor (CROSSHAIR);
+ trimmer_cursor = new Gdk::Cursor (SB_H_DOUBLE_ARROW);
+ selector_cursor = new Gdk::Cursor (XTERM);
+ time_fx_cursor = new Gdk::Cursor (SIZING);
+ wait_cursor = new Gdk::Cursor (WATCH);
+ timebar_cursor = new Gdk::Cursor(LEFT_PTR);
}
void
diff --git a/gtk2_ardour/editor_xpms b/gtk2_ardour/editor_xpms
index 880ac9ab6f..1dd134c959 100644
--- a/gtk2_ardour/editor_xpms
+++ b/gtk2_ardour/editor_xpms
@@ -1,21 +1,4 @@
/* Created with The GIMP */
-#define hand_width 16
-#define hand_height 16
-#define hand_x_hot 3
-#define hand_y_hot 0
-static const gchar hand_bits[] = {
- 0x18, 0x00, 0x24, 0x00, 0x24, 0x00, 0x24, 0x00, 0xe4, 0x36, 0x24, 0x49,
- 0x27, 0x49, 0x25, 0x49, 0x25, 0x49, 0x01, 0x40, 0x01, 0x40, 0x01, 0x40,
- 0x02, 0x40, 0x04, 0x60, 0xfc, 0x3f, 0xfc, 0x3f };
-
-/* Created with The GIMP */
-#define handmask_width 16
-#define handmask_height 16
-static const gchar handmask_bits[] = {
- 0x18, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0xfc, 0x36, 0xfc, 0x7f,
- 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f,
- 0xfe, 0x7f, 0xfc, 0x7f, 0xfc, 0x3f, 0xfc, 0x3f };
-
#define mag_width 16
#define mag_height 16
#define mag_x_hot 9