ardour/livetrax
13
0
Fork 0
Code

fixed return types for ::on_....; changed set_usize_... utility functions to set_size_request...

Browse Source 
git-svn-id: svn://localhost/trunk/ardour2@39 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2005-09-26 03:13:13 +00:00
parent 25ac88fcae
commit d880812c3a
9 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/ardour_dialog.h
View File

@ -49,9 +49,9 @@ class ArdourDialog : public Gtk::Window, public KeyboardTarget
void set_hide_on_stop (bool yn);
int run_status();
gint on_enter_notify_event (GdkEventCrossing*);
gint on_leave_notify_event (GdkEventCrossing*);
gint on_unmap (GdkEventAny *);
bool on_enter_notify_event (GdkEventCrossing*);
bool on_leave_notify_event (GdkEventCrossing*);
bool on_unmap (GdkEventAny *);
ARDOUR::Session *session;

2
gtk2_ardour/connection_editor.h
View File

@ -53,7 +53,7 @@ class ConnectionEditor : public ArdourDialog {
void set_session (ARDOUR::Session *);
protected:
gint on_map (GdkEventAny *);
bool on_map (GdkEventAny *);
private:
ARDOUR::Connection *current_connection;

4
gtk2_ardour/io_selector.h
View File

@ -116,7 +116,7 @@ class IOSelectorWindow : public ArdourDialog
IOSelector& selector() { return _selector; }
protected:
gint on_map (GdkEventAny *);
bool on_map (GdkEventAny *);
private:
IOSelector _selector;
@ -158,7 +158,7 @@ class PortInsertWindow : public ArdourDialog
PortInsertWindow (ARDOUR::Session&, ARDOUR::PortInsert&, bool can_cancel=false);
protected:
gint on_map (GdkEventAny *);
bool on_map (GdkEventAny *);
private:

4
gtk2_ardour/meter_bridge.h
View File

@ -54,8 +54,8 @@ class MeterBridge : public ArdourDialog
void toggle_metering ();
protected:
gint on_map (GdkEventAny *);
gint on_unmap (GdkEventAny *);
bool on_map (GdkEventAny *);
bool on_unmap (GdkEventAny *);
private:
/* diskstream/recorder display */

8
gtk2_ardour/panner2d.h
View File

@ -63,10 +63,10 @@ class Panner2d : public Gtk::DrawingArea
sigc::signal<void,int> TargetMoved;
protected:
gint on_expose_event (GdkEventExpose *);
gint on_button_press_event (GdkEventButton *);
gint on_button_release_event (GdkEventButton *);
gint on_motion_notify_event (GdkEventMotion *);
bool on_expose_event (GdkEventExpose *);
bool on_button_press_event (GdkEventButton *);
bool on_button_release_event (GdkEventButton *);
bool on_motion_notify_event (GdkEventMotion *);
void on_size_allocate (GtkAllocation* alloc);
private:

10
libs/gtkmm2ext/gtkmm2ext/utils.h
View File

@ -26,11 +26,11 @@
namespace Gtkmm2ext {
void init ();
void set_usize_to_display_given_text (Gtk::Widget &w,
const gchar *text,
gint hpadding,
gint vpadding);
void set_size_request_to_display_given_text (Gtk::Widget &w,
const gchar *text,
gint hpadding,
gint vpadding);
template<class T> void deferred_delete (void *ptr) {
delete static_cast<T *> (ptr);
}

8
libs/gtkmm2ext/gtkutils.cc
View File

@ -24,10 +24,10 @@
#include <gtkmm2ext/gtkutils.h>
void
set_usize_to_display_given_text (Gtk::Widget &w,
const std::string& text,
gint hpadding,
gint vpadding)
set_size_request_to_display_given_text (Gtk::Widget &w,
const std::string& text,
gint hpadding,
gint vpadding)
{
int height = 0;
int width = 0;

2
libs/gtkmm2ext/popup.cc
View File

@ -85,7 +85,7 @@ PopUp::touch ()
if (is_visible ()) {
remove ();
} else {
set_usize_to_display_given_text (label, my_text.c_str(), 25, 10);
set_size_request_to_display_given_text (label, my_text.c_str(), 25, 10);
label.set_text (my_text);
show_all ();

6
libs/gtkmm2ext/utils.cc
View File

@ -24,12 +24,12 @@
#include "i18n.h"
void
Gtkmm2ext::set_usize_to_display_given_text (Gtk::Widget &w, const gchar *text,
gint hpadding, gint vpadding)
Gtkmm2ext::set_size_request_to_display_given_text (Gtk::Widget &w, const gchar *text,
gint hpadding, gint vpadding)
{
w.ensure_style ();
set_usize_to_display_given_text(w, text, hpadding, vpadding);
set_size_request_to_display_given_text(w, text, hpadding, vpadding);
}
gint