From 7ae08aa608cc42d8b92bd6409d1b75d2185c75ee Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@joel-desktop.(none)>
Date: Mon, 24 Nov 2008 17:38:26 +0000
Subject: [PATCH] Corrected some mistakes in old dialog headers

---
 src/gui/dialogs/preferences-dialog.hpp | 15 ++++++-------
 src/gui/dialogs/render.hpp             | 30 ++++++++++++--------------
 2 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/src/gui/dialogs/preferences-dialog.hpp b/src/gui/dialogs/preferences-dialog.hpp
index 8178b2967..6e9ce2087 100644
--- a/src/gui/dialogs/preferences-dialog.hpp
+++ b/src/gui/dialogs/preferences-dialog.hpp
@@ -27,9 +27,7 @@
 #ifndef PREFERENCES_DIALOG_HPP
 #define PREFERENCES_DIALOG_HPP
 
-#include <gtkmm.h>
-
-using namespace Gtk;
+#include "../gtk-lumiera.hpp"
 
 namespace gui {
 namespace dialogs {
@@ -37,20 +35,19 @@ namespace dialogs {
 /** 
  * The defintion of render output dialog class
  */
-class PreferencesDialog : public Dialog
+class PreferencesDialog : public Gtk::Dialog
 {
 public:
-  PreferencesDialog(Window &parent);
+  PreferencesDialog(Gtk::Window &parent);
 
 protected:
   
 
 protected:
-  Notebook notebook;
-
-  VBox interfaceBox;
-  ComboBox interfaceThemeCombo;
+  Gtk::Notebook notebook;
 
+  Gtk::VBox interfaceBox;
+  Gtk::ComboBox interfaceThemeCombo;
 };
 
 }   // namespace dialogs
diff --git a/src/gui/dialogs/render.hpp b/src/gui/dialogs/render.hpp
index a8b9b4b85..f755bf0f9 100644
--- a/src/gui/dialogs/render.hpp
+++ b/src/gui/dialogs/render.hpp
@@ -27,9 +27,7 @@
 #ifndef RENDER_H
 #define RENDER_H
 
-#include <gtkmm.h>
-
-using namespace Gtk;
+#include "../gtk-lumiera.hpp"
 
 namespace gui {
 namespace dialogs {
@@ -37,31 +35,31 @@ namespace dialogs {
 /** 
  * The defintion of render output dialog class
  */
-class Render : public Dialog
+class Render : public Gtk::Dialog
 {
 public:
-  Render(Window &parent);
+  Render(Gtk::Window &parent);
 
 protected:
   void on_button_browse();
 
 protected:
-  HBox outputFileHBox;
-  Label outputFileLabel;
-  Entry outputFilePathEntry;
+  Gtk::HBox outputFileHBox;
+  Gtk::Label outputFileLabel;
+  Gtk::Entry outputFilePathEntry;
 
-  Image browseButtonImage;
-  Button outputFileBrowseButton;
+  Gtk::Image browseButtonImage;
+  Gtk::Button outputFileBrowseButton;
 
-  HBox containerFormatHBox;
-  Label containerFormatLabel;
-  ComboBox containerFormat;
+  Gtk::HBox containerFormatHBox;
+  Gtk::Label containerFormatLabel;
+  Gtk::ComboBox containerFormat;
 
-  Frame audioFrame;
+  Gtk::Frame audioFrame;
 
-  Frame videoFrame;
+  Gtk::Frame videoFrame;
 
-  Image renderButtonImage;
+  Gtk::Image renderButtonImage;
 };
 
 }   // namespace dialogs