nemiver r682 - in trunk: . src/persp/dbgperspective src/uicommon

[jjongsma svn gnome org]

Author: jjongsma
Date: Mon Jan 14 04:03:19 2008
New Revision: 682
URL: http://svn.gnome.org/viewvc/nemiver?rev=682&view=rev

Log:
	* configure.ac: removed accidentally duplicated variable
	* src/uicommon/nmv-hex-editor.cc:
	* src/uicommon/nmv-hex-editor.h: make get_widget() return a Gtk::Container&
	so that we can use the Container functions such as set_border_width()
	* src/persp/dbgperspective/nmv-memory-view.cc: set HexEditor widget's
	border_width to 0 so that there is not a thick black border around the whole
	hex editor widget.  There's still a black divider between the hex and the
	ascii portions of the widget, however, and I can't figure out how to get
	that to match the theme background color instead of black...


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/persp/dbgperspective/nmv-memory-view.cc
   trunk/src/uicommon/nmv-hex-editor.cc
   trunk/src/uicommon/nmv-hex-editor.h

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Jan 14 04:03:19 2008
@@ -162,7 +162,6 @@
     LIBGTKSOURCEVIEWMM_VERSION=$LIBGTKSOURCEVIEWMM1_VERSION
     LIBGTKSOURCEVIEWMM_PKG=libgtksourceviewmm-1.0
 fi
-AM_CONDITIONAL(BUILD_MEMORYVIEW, test x$ENABLE_MEMORYVIEW = xyes)
 
 
 ENABLE_DEBUG=yes

Modified: trunk/src/persp/dbgperspective/nmv-memory-view.cc
==============================================================================
--- trunk/src/persp/dbgperspective/nmv-memory-view.cc	(original)
+++ trunk/src/persp/dbgperspective/nmv-memory-view.cc	Mon Jan 14 04:03:19 2008
@@ -108,6 +108,7 @@
         m_editor->set_geometry (20 /*characters per line*/, 6 /*lines*/);
         m_editor->show_offsets ();
         m_scrolledwindow->set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_NEVER);
+        m_editor->get_widget ().set_border_width (0);
         m_scrolledwindow->add (m_editor->get_widget ());
         m_scrolledwindow->set_shadow_type (Gtk::SHADOW_IN);
 

Modified: trunk/src/uicommon/nmv-hex-editor.cc
==============================================================================
--- trunk/src/uicommon/nmv-hex-editor.cc	(original)
+++ trunk/src/uicommon/nmv-hex-editor.cc	Mon Jan 14 04:03:19 2008
@@ -23,7 +23,7 @@
  *See COPYRIGHT file copyright information.
  */
 
-#include <gtkmm/widget.h>
+#include <gtkmm/container.h>
 #include "common/nmv-exception.h"
 #include "nmv-hex-editor.h"
 #include <gtkhex/gtkhex.h>
@@ -56,14 +56,14 @@
 
 struct Editor::Priv {
     SafePtr<GtkHex, GtkHexRef, GtkHexUnref> hex ;
-    Gtk::Widget *widget ;
+    Gtk::Container *widget ;
 
     Priv (const DocumentSafePtr& a_doc) :
         hex (GTK_HEX (gtk_hex_new (a_doc->cobj())), true),
         widget (0)
     {
         THROW_IF_FAIL (GTK_IS_WIDGET (hex.get ())) ;
-        widget = Glib::wrap (GTK_WIDGET (hex.get ())) ;
+        widget = Glib::wrap (GTK_CONTAINER (hex.get ())) ;
         THROW_IF_FAIL (widget) ;
     }
 
@@ -229,7 +229,7 @@
 Editor::delete_autohighlight (GtkHex_AutoHighlight *ahl);
 */
 
-Gtk::Widget&
+Gtk::Container&
 Editor::get_widget () const
 {
     THROW_IF_FAIL (m_priv) ;

Modified: trunk/src/uicommon/nmv-hex-editor.h
==============================================================================
--- trunk/src/uicommon/nmv-hex-editor.h	(original)
+++ trunk/src/uicommon/nmv-hex-editor.h	Mon Jan 14 04:03:19 2008
@@ -87,7 +87,7 @@
     //GtkHex_AutoHighlight *insert_autohighlight (const gchar *search, int len,
             //const gchar *colour);
     //void delete_autohighlight (GtkHex_AutoHighlight *ahl);
-    virtual Gtk::Widget& get_widget () const ;
+    virtual Gtk::Container& get_widget () const ;
 };//end class Editor
 
 NEMIVER_END_NAMESPACE (Hex)