Changeset 3edaafe4051a0101b29a54b073c06b46e9e71e89

Timestamp:

01/06/07 23:31:56 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

654b4976de6e507f77fdc8c3d46df0be62f72890

Children:

9f3f19120242fc7ff56283a4b07f09c6216f192f

git-committer:

Philipp Kern <phil@0x539.de> / 2007-01-06T22:31:56Z+0000

Message:

[project @ GtkSourceBuffer? wrapper]

Original author: Armin Burgmeier <armin@…>
Date: 2005-04-20 17:58:59+00:00

Files:

• Makefile.am (modified) (2 diffs)
• inc/sourceview/private/sourcebuffer_p.hpp (added)
• inc/sourceview/sourcebuffer.hpp (added)
• inc/sourceview/sourceview.hpp (modified) (2 diffs)
• src/document.cpp (modified) (1 diff)
• src/sourceview/sourcebuffer.cpp (added)
• src/sourceview/sourceview.cpp (modified) (3 diffs)

Makefile.am

@@ -33 +33 @@
 if WITH_GTKSOURCEVIEW
 noinst_HEADERS += inc/sourceview/sourceview.hpp
+noinst_HEADERS += inc/sourceview/sourcebuffer.hpp
 noinst_HEADERS += inc/sourceview/private/sourceview_p.hpp
+noinst_HEADERS += inc/sourceview/private/sourcebuffer_p.hpp
 endif
 noinst_HEADERS += inc/icon.hpp
@@ -58 +60 @@
 if WITH_GTKSOURCEVIEW
 gobby_SOURCES += src/sourceview/sourceview.cpp
+gobby_SOURCES += src/sourceview/sourcebuffer.cpp
 endif
 gobby_SOURCES += src/icon.cpp

inc/sourceview/sourceview.hpp

@@ -25 +25 @@
 #include <gtkmm/textview.h>
 #include <gtksourceview/gtksourceview.h>
+#include "sourceview/sourcebuffer.hpp"
 
 typedef struct _GtkSourceView GtkSourceView;
@@ -70 +71 @@
 public:
         SourceView();
-//      explicit SourceView(const Glib::RefPtr<SourceBuffer>& buffer);
+        explicit SourceView(const Glib::RefPtr<SourceBuffer>& buffer);
 
-//      Glib::RefPtr<SourceBuffer> get_buffer();
-//      Glib::RefPtr<const SourceBuffer> get_buffer() const;
-        
+        Glib::RefPtr<SourceBuffer> get_buffer();
+        Glib::RefPtr<const SourceBuffer> get_buffer() const;
+        void set_buffer(const Glib::RefPtr<SourceBuffer> buffer);
+
+        // TODO: Properties fuer das Zeug und so(?)
+        bool get_show_line_numbers() const;
+        void set_show_line_numbers(bool show_line_numbers);
 };
 

src/document.cpp

@@ -22 +22 @@
  : Gtk::ScrolledWindow(), m_doc(doc), m_editing(true)
 {
+#ifdef WITH_GTKSOURCEVIEW
+        m_view.set_show_line_numbers(true);
+#endif
+
         Glib::RefPtr<Gtk::TextBuffer> buf = m_view.get_buffer();
 

src/sourceview/sourceview.cpp

@@ -50 +50 @@
  : Gtk::TextView(Glib::ConstructParams(sourceview_class_.init()))
 {
+        // gtkmm-magic creates a GtkTextBuffer instead of a GtkSourceBuffer
+        // I could not figure out why, but this line fixes this issue...
+        // - armin
+        set_buffer(SourceBuffer::create() );
 }
 
@@ -62 +66 @@
 }
 
-/*Gtk::SourceView::SourceView(const Glib::RefPtr<SourceBuffer>& buffer)
-   Gtk::TextView(Glib::ConstructParams(sourceview_class_.init(), (char*)0))
+Gtk::SourceView::SourceView(const Glib::RefPtr<SourceBuffer>& buffer)
+ : Gtk::TextView(Glib::ConstructParams(sourceview_class_.init(), (char*)0))
 {
         set_buffer(buffer);
-}*/
+}
 
 Gtk::SourceView::~SourceView()
 {
-        // TODO: TextView-dtor calls destroy_ as well...
         destroy_();
 }
@@ -84 +87 @@
 }
 
-/*Glib::RefPtr<Gtk::SourceBuffer> Gtk::SourceView::get_buffer()
+Glib::RefPtr<Gtk::SourceBuffer> Gtk::SourceView::get_buffer()
 {
-        return Glib::RefPtr<Gtk::SourceBuffer>::cast_static(Gtk::TextView::get_buffer() );
+        return Glib::RefPtr<Gtk::SourceBuffer>
+                ::cast_static(Gtk::TextView::get_buffer() );
 }
 
 Glib::RefPtr<const Gtk::SourceBuffer> Gtk::SourceView::get_buffer() const
 {
-        return Glib::RefPtr<Gtk::SourceBuffer>::cast_static(Gtk::TextView::get_buffer() );
+        return Glib::RefPtr<const Gtk::SourceBuffer>
+                ::cast_static(Gtk::TextView::get_buffer() );
 }
-*/
+
+void Gtk::SourceView::set_buffer(const Glib::RefPtr<SourceBuffer> buffer)
+{
+        Gtk::TextView::set_buffer(buffer);
+}
+
+bool Gtk::SourceView::get_show_line_numbers() const
+{
+        return gtk_source_view_get_show_line_numbers(
+                GTK_SOURCE_VIEW(gobject_) ) == TRUE;
+}
+
+void Gtk::SourceView::set_show_line_numbers(bool show_line_numbers)
+{
+        gtk_source_view_set_show_line_numbers(
+                gobj(),
+                show_line_numbers ? TRUE : FALSE
+        );
+}
+
+Gtk::SourceView* Glib::wrap(GtkSourceView* object, bool take_copy)
+{
+        return dynamic_cast<Gtk::SourceView*>(Glib::wrap_auto(
+                reinterpret_cast<GObject*>(object),
+                take_copy
+        ) );
+}