Manual merge from Branch3

2011-03-20 11:38:27 +01:00
parent f9d74687b9
commit bfb5012eb4
9 changed files with 153 additions and 160 deletions
--- a/rtgui/preferences.h
+++ b/rtgui/preferences.h
@@ -144,7 +144,8 @@ class Preferences : public Gtk::Dialog {
    Gtk::Widget* getSoundPanel ();
    
  public:
-         Preferences (RTWindow *rtwindow);
+	Preferences (RTWindow *rtwindow);
+	~Preferences ();
    
    void savePressed ();
    void loadPressed ();