[gnome-commander] TextRender: initial migration to C++

[Piotr Eljasiak <epiotr src gnome org>]

commit bfa3b8ba332e5f718450f001482ac2119c9542c7
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Wed Jul 27 22:19:33 2011 +0200

    TextRender: initial migration to C++

 src/intviewer/text-render.cc   |    8 ++++----
 src/intviewer/text-render.h    |   29 ++++++++++++++---------------
 src/intviewer/viewer-widget.cc |    4 ++--
 3 files changed, 20 insertions(+), 21 deletions(-)
---
diff --git a/src/intviewer/text-render.cc b/src/intviewer/text-render.cc
index f73c420..c65b968 100644
--- a/src/intviewer/text-render.cc
+++ b/src/intviewer/text-render.cc
@@ -70,11 +70,11 @@ struct TextRenderClass
 {
     GtkWidgetClass parent_class;
 
-    void (* text_status_changed) (TextRender *obj, TextRenderStatus *status);
+    void (* text_status_changed) (TextRender *obj, TextRender::Status *status);
 };
 
 // Class Private Data
-struct TextRenderPrivate
+struct TextRender::Private
 {
     guint8 button; // The button pressed in "button_press_event"
 
@@ -228,7 +228,7 @@ void text_render_set_v_adjustment (TextRender *obj, GtkAdjustment *adjustment)
 
 static void text_render_init (TextRender *w)
 {
-    w->priv = g_new0 (TextRenderPrivate, 1);
+    w->priv = g_new0 (TextRender::Private, 1);
 
     w->priv->button = 0;
     w->priv->dispmode = TR_DISP_MODE_TEXT;
@@ -333,7 +333,7 @@ void text_render_notify_status_changed(TextRender *w)
 {
     g_return_if_fail (IS_TEXT_RENDER (w));
 
-    TextRenderStatus stat;
+    TextRender::Status stat;
 
     memset(&stat, 0, sizeof(stat));
 
diff --git a/src/intviewer/text-render.h b/src/intviewer/text-render.h
index e721b4e..d1dd3ec 100644
--- a/src/intviewer/text-render.h
+++ b/src/intviewer/text-render.h
@@ -36,13 +36,22 @@
 GType text_render_get_type ();
 
 
-struct TextRenderPrivate;
-struct TextRenderStatus;
-
 struct TextRender
 {
-    GtkWidget widget;
-    TextRenderPrivate *priv;
+    GtkWidget parent;
+
+    struct Private;
+
+    Private *priv;
+
+    struct Status
+    {
+        offset_type current_offset;
+        offset_type size;
+        int         column;
+        const char *encoding;
+        gboolean    wrap_mode;
+    };
 };
 
 enum TEXTDISPLAYMODE
@@ -52,16 +61,6 @@ enum TEXTDISPLAYMODE
     TR_DISP_MODE_HEXDUMP
 };
 
-struct TextRenderStatus
-{
-    offset_type current_offset;
-    offset_type size;
-    int         column;
-    const char *encoding;
-    gboolean    wrap_mode;
-};
-
-
 inline GtkWidget *text_render_new ()
 {
     return (GtkWidget *) g_object_new (TYPE_TEXT_RENDER, NULL);
diff --git a/src/intviewer/viewer-widget.cc b/src/intviewer/viewer-widget.cc
index ccac65a..0b8cc7f 100644
--- a/src/intviewer/viewer-widget.cc
+++ b/src/intviewer/viewer-widget.cc
@@ -83,7 +83,7 @@ static void gviewer_init (GViewer *w);
 static void gviewer_class_init (GViewerClass *klass);
 static void gviewer_destroy (GtkObject *object);
 
-static void gviewer_text_status_update(TextRender *obj, TextRenderStatus *status, GViewer *viewer);
+static void gviewer_text_status_update(TextRender *obj, TextRender::Status *status, GViewer *viewer);
 static void gviewer_image_status_update(ImageRender *obj, ImageRenderStatus *status, GViewer *viewer);
 static gboolean on_text_viewer_button_pressed (GtkWidget *treeview, GdkEventButton *event, GViewer *viewer);
 
@@ -199,7 +199,7 @@ static void gviewer_init (GViewer *w)
 
 
 #define MAX_STATUS_LENGTH 128
-static void gviewer_text_status_update(TextRender *obj, TextRenderStatus *status, GViewer *viewer)
+static void gviewer_text_status_update(TextRender *obj, TextRender::Status *status, GViewer *viewer)
 {
     g_return_if_fail (IS_GVIEWER (viewer));
     g_return_if_fail (status!=NULL);