[gnome-commander] Replaced gnome_cmd_main_win_new() with GnomeCmdMainWin::operator new()
- From: Piotr Eljasiak <epiotr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander] Replaced gnome_cmd_main_win_new() with GnomeCmdMainWin::operator new()
- Date: Mon, 28 Jun 2010 17:56:53 +0000 (UTC)
commit 38dd132d3bedadd572915159343d230aa42104aa
Author: Piotr Eljasiak <epiotr src gnome org>
Date: Mon Jun 28 19:51:10 2010 +0200
Replaced gnome_cmd_main_win_new() with GnomeCmdMainWin::operator new()
src/gnome-cmd-main-win.cc | 8 --------
src/gnome-cmd-main-win.h | 13 +++++++------
src/main.cc | 4 ++--
3 files changed, 9 insertions(+), 16 deletions(-)
---
diff --git a/src/gnome-cmd-main-win.cc b/src/gnome-cmd-main-win.cc
index 5b28729..dec5749 100644
--- a/src/gnome-cmd-main-win.cc
+++ b/src/gnome-cmd-main-win.cc
@@ -874,14 +874,6 @@ GtkType gnome_cmd_main_win_get_type ()
}
-GtkWidget *gnome_cmd_main_win_new ()
-{
- GnomeCmdMainWin *mw = (GnomeCmdMainWin *) gtk_type_new (gnome_cmd_main_win_get_type ());
-
- return GTK_WIDGET (mw);
-}
-
-
GnomeCmdFileSelector *GnomeCmdMainWin::fs(FileSelectorID id)
{
switch (id)
diff --git a/src/gnome-cmd-main-win.h b/src/gnome-cmd-main-win.h
index d640463..6cf152a 100644
--- a/src/gnome-cmd-main-win.h
+++ b/src/gnome-cmd-main-win.h
@@ -26,9 +26,10 @@
#include "gnome-cmd-cmdline.h"
#include "plugin_manager.h"
-#define GNOME_CMD_MAIN_WIN(obj) GTK_CHECK_CAST(obj, gnome_cmd_main_win_get_type (), GnomeCmdMainWin)
-#define GNOME_CMD_MAIN_WIN_CLASS(klass) GTK_CHECK_CLASS_CAST(klass, gnome_cmd_main_win_get_type (), GnomeCmdMainWinClass)
-#define GNOME_CMD_IS_MAIN_WIN(obj) GTK_CHECK_TYPE(obj, gnome_cmd_main_win_get_type ())
+#define GNOME_CMD_TYPE_MAIN_WIN (gnome_cmd_main_win_get_type ())
+#define GNOME_CMD_MAIN_WIN(obj) GTK_CHECK_CAST(obj, GNOME_CMD_TYPE_MAIN_WIN, GnomeCmdMainWin)
+#define GNOME_CMD_MAIN_WIN_CLASS(klass) GTK_CHECK_CLASS_CAST(klass, GNOME_CMD_TYPE_MAIN_WIN, GnomeCmdMainWinClass)
+#define GNOME_CMD_IS_MAIN_WIN(obj) GTK_CHECK_TYPE(obj, GNOME_CMD_TYPE_MAIN_WIN)
GtkType gnome_cmd_main_win_get_type ();
@@ -48,6 +49,9 @@ struct GnomeCmdMainWin
Private *priv;
+ void *operator new (size_t size) { return g_object_new (GNOME_CMD_TYPE_MAIN_WIN, NULL); }
+ void operator delete (void *p) { g_object_unref (p); }
+
operator GObject * () { return G_OBJECT (this); }
operator GtkObject * () { return GTK_OBJECT (this); }
operator GtkWidget * () { return GTK_WIDGET (this); }
@@ -84,9 +88,6 @@ struct GnomeCmdMainWin
};
-GtkWidget *gnome_cmd_main_win_new ();
-
-
extern GnomeCmdMainWin *main_win;
#endif // __GNOME_CMD_MAIN_WIN_H__
diff --git a/src/main.cc b/src/main.cc
index f65789c..486723b 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -164,8 +164,8 @@ int main (int argc, char *argv[])
gnome_cmd_style_create ();
- main_win_widget = gnome_cmd_main_win_new ();
- main_win = GNOME_CMD_MAIN_WIN (main_win_widget);
+ main_win = new GnomeCmdMainWin;
+ main_win_widget = *main_win;
unique_app_watch_window (app, *main_win);
g_signal_connect (app, "message-received", G_CALLBACK (on_message_received), NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]