projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
implement visual-sensitivity (gray out) for faders
[ardour.git]
/
libs
/
gtkmm2ext
/
cairocell.cc
diff --git
a/libs/gtkmm2ext/cairocell.cc
b/libs/gtkmm2ext/cairocell.cc
index 97c806752ad8af99371b002fb0e99606307347d9..f20f537e1b972f2ebafadde4b55258fed6d14ef8 100644
(file)
--- a/
libs/gtkmm2ext/cairocell.cc
+++ b/
libs/gtkmm2ext/cairocell.cc
@@
-39,43
+39,43
@@
CairoFontDescription::CairoFontDescription (Pango::FontDescription& fd)
switch (fd.get_style()) {
case Pango::STYLE_NORMAL:
switch (fd.get_style()) {
case Pango::STYLE_NORMAL:
- slant = Cairo::FONT_SLANT_NORMAL;
+
_
slant = Cairo::FONT_SLANT_NORMAL;
break;
case Pango::STYLE_OBLIQUE:
break;
case Pango::STYLE_OBLIQUE:
- slant = Cairo::FONT_SLANT_OBLIQUE;
+
_
slant = Cairo::FONT_SLANT_OBLIQUE;
break;
case Pango::STYLE_ITALIC:
break;
case Pango::STYLE_ITALIC:
- slant = Cairo::FONT_SLANT_ITALIC;
+
_
slant = Cairo::FONT_SLANT_ITALIC;
break;
}
switch (fd.get_weight()) {
case Pango::WEIGHT_ULTRALIGHT:
break;
}
switch (fd.get_weight()) {
case Pango::WEIGHT_ULTRALIGHT:
- weight = Cairo::FONT_WEIGHT_NORMAL;
+
_
weight = Cairo::FONT_WEIGHT_NORMAL;
break;
case Pango::WEIGHT_LIGHT:
break;
case Pango::WEIGHT_LIGHT:
- weight = Cairo::FONT_WEIGHT_NORMAL;
+
_
weight = Cairo::FONT_WEIGHT_NORMAL;
break;
case Pango::WEIGHT_NORMAL:
break;
case Pango::WEIGHT_NORMAL:
- weight = Cairo::FONT_WEIGHT_NORMAL;
+
_
weight = Cairo::FONT_WEIGHT_NORMAL;
break;
case Pango::WEIGHT_SEMIBOLD:
break;
case Pango::WEIGHT_SEMIBOLD:
- weight = Cairo::FONT_WEIGHT_BOLD;
+
_
weight = Cairo::FONT_WEIGHT_BOLD;
break;
case Pango::WEIGHT_BOLD:
break;
case Pango::WEIGHT_BOLD:
- weight = Cairo::FONT_WEIGHT_BOLD;
+
_
weight = Cairo::FONT_WEIGHT_BOLD;
break;
case Pango::WEIGHT_ULTRABOLD:
break;
case Pango::WEIGHT_ULTRABOLD:
- weight = Cairo::FONT_WEIGHT_BOLD;
+
_
weight = Cairo::FONT_WEIGHT_BOLD;
break;
case Pango::WEIGHT_HEAVY:
break;
case Pango::WEIGHT_HEAVY:
- weight = Cairo::FONT_WEIGHT_BOLD;
+
_
weight = Cairo::FONT_WEIGHT_BOLD;
break;
}
break;
}
@@
-211,7
+211,6
@@
CairoEditableText::CairoEditableText (boost::shared_ptr<CairoFontDescription> fo
set_flags (Gtk::CAN_FOCUS);
set_can_default (true);
set_flags (Gtk::CAN_FOCUS);
set_can_default (true);
- set_receives_default (true);
}
CairoEditableText::~CairoEditableText ()
}
CairoEditableText::~CairoEditableText ()
@@
-232,13
+231,13
@@
CairoEditableText::on_scroll_event (GdkEventScroll* ev)
}
bool
}
bool
-CairoEditableText::on_focus_in_event (GdkEventFocus*
ev
)
+CairoEditableText::on_focus_in_event (GdkEventFocus*)
{
return false;
}
bool
{
return false;
}
bool
-CairoEditableText::on_focus_out_event (GdkEventFocus*
ev
)
+CairoEditableText::on_focus_out_event (GdkEventFocus*)
{
if (editing_cell) {
queue_draw_cell (editing_cell);
{
if (editing_cell) {
queue_draw_cell (editing_cell);
@@
-287,7
+286,14
@@
CairoEditableText::set_text (CairoTextCell* cell, const string& text)
bool
CairoEditableText::on_expose_event (GdkEventExpose* ev)
{
bool
CairoEditableText::on_expose_event (GdkEventExpose* ev)
{
- Cairo::RefPtr<Cairo::Context> context = get_window()->create_cairo_context();
+ Glib::RefPtr<Gdk::Window> win = get_window ();
+
+ if (!win) {
+ std::cerr << "CET: no window to draw on\n";
+ return false;
+ }
+
+ Cairo::RefPtr<Cairo::Context> context = win->create_cairo_context();
if (cells.empty()) {
return true;
if (cells.empty()) {
return true;