Changeset 3752fd809ac835ae6c3a647bd5fede233249a515

Timestamp:

10/14/07 22:20:05 (6 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

e3caa739b035dc68fe130b1f935e7df3ae53a88a

Children:

3c5bf1edc55dbb8db2f593b5b8b4e26bda098f86

git-committer:

Armin Burgmeier <armin@0x539.de> / 2007-10-14T20:20:05Z+0000

Message:

2007-10-14 Armin Burgmeier <armin@…>

• inc/preferencesdialog.hpp:
• src/preferencesdialog.cpp: Don't use the tooltip for the smart home/end option when gtkmm was built without deprecated API.

• src/logview.cpp: Replaced scroll_to_mark by scroll_to because the former is deprecated.

• src/docwindow.cpp: Fix gtksourceview1 build.

Files:

• ChangeLog (modified) (1 diff)
• inc/preferencesdialog.hpp (modified) (2 diffs)
• src/docwindow.cpp (modified) (4 diffs)
• src/logview.cpp (modified) (1 diff)
• src/preferencesdialog.cpp (modified) (3 diffs)

ChangeLog

@@ +1 @@
+2007-10-14  Armin Burgmeier  <armin@0x539.de>
+
+        * inc/preferencesdialog.hpp:
+        * src/preferencesdialog.cpp: Don't use the tooltip for the smart
+        home/end option when gtkmm was built without deprecated API.
+
+        * src/logview.cpp: Replaced scroll_to_mark by scroll_to because the
+        former is deprecated.
+
+        * src/docwindow.cpp: Fix gtksourceview1 build.
+
 2007-09-30  Benjamin Herr  <ben@0x539.de>
 

inc/preferencesdialog.hpp

@@ -54 +54 @@
         {
         public:
+#ifndef GTKMM_DISABLE_DEPRECATED
                 Editor(const Preferences& preferences,
                        Gtk::Tooltips& tooltips);
+#else
+                Editor(const Preferences& preferences);
+#endif
 
                 void set(Preferences::Editor& editor) const;
@@ -267 +271 @@
 protected:
         Gtk::Notebook m_notebook;
+
+#ifndef GTKMM_DISABLE_DEPRECATED
         Gtk::Tooltips m_tooltips;
+#endif
 
         Editor m_page_editor;

src/docwindow.cpp

@@ -70 +70 @@
                 Glib::wrap(GTK_TEXT_BUFFER(buffer), true);
 
+#ifdef WITH_GTKSOURCEVIEW2
         // Set source language by filename
         gtk_source_buffer_set_highlight_syntax(buffer, FALSE);
+#else
+        gtk_source_buffer_set_highlight(buffer, FALSE);
+#endif
 
         for(Preferences::FileList::iterator iter = preferences.files.begin();
@@ -81 +85 @@
                 {
                         gtk_source_buffer_set_language(buffer, iter.language());
+#ifdef WITH_GTKSOURCEVIEW2
                         gtk_source_buffer_set_highlight_syntax(buffer, TRUE);
+#else
+                        gtk_source_buffer_set_highlight(buffer, TRUE);
+#endif
                 }
         }
@@ -226 +234 @@
 
         gtk_source_buffer_set_language(buffer, language);
+
+#ifdef WITH_GTKSOURCEVIEW2
         gtk_source_buffer_set_highlight_syntax(buffer, language != NULL);
+#else
+        gtk_source_buffer_set_highlight(buffer, language != NULL);
+#endif
 
         m_signal_language_changed.emit();
@@ -344 +357 @@
         GtkTextBuffer* buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(m_view));
 
+#ifdef WITH_GTKSOURCEVIEW2
         gtk_source_view_set_tab_width(GTK_SOURCE_VIEW(m_view),
                 m_preferences.editor.tab_width);
+#else
+        gtk_source_view_set_tabs_width(GTK_SOURCE_VIEW(m_view),
+                m_preferences.editor.tab_width);
+#endif
+
         gtk_source_view_set_insert_spaces_instead_of_tabs(GTK_SOURCE_VIEW(m_view),
                 m_preferences.editor.tab_spaces);

src/logview.cpp

@@ -136 +136 @@
         );
 
-        scroll_to_mark(m_end_mark, 0.0f);
+        scroll_to(m_end_mark, 0.0f);
 
 #ifdef HAVE_SHOW_URL

src/preferencesdialog.cpp

@@ -56 +56 @@
 }
 
+#ifndef GTKMM_DISABLE_DEPRECATED
 Gobby::PreferencesDialog::Editor::Editor(const Preferences& preferences,
                                          Gtk::Tooltips& tooltips):
+#else
+Gobby::PreferencesDialog::Editor::Editor(const Preferences& preferences):
+#endif
         m_frame_tab(_("Tab Stops") ),
         m_frame_indentation(_("Indentation") ),
@@ -75 +79 @@
         m_ent_tab_width.set_increments(1, 1);
 
+#ifndef GTKMM_DISABLE_DEPRECATED
         // TODO: Improve this description
         tooltips.set_tip(m_btn_homeend_smart,
                 _("With this option enabled, Home/End keys move to first/last "
                   "character before going to the start/end of the line.") );
+#endif
 
         m_box_tab_width.set_spacing(5);
@@ -693 +699 @@
                                             bool local)
  : Gtk::Dialog(_("Preferences"), parent, true),
-   m_page_editor(preferences, m_tooltips), m_page_view(preferences),
-   m_page_appearance(preferences), m_page_font(preferences),
-   m_page_behaviour(preferences), m_page_files(*this, preferences, lang_mgr)
+#ifndef GTKMM_DISABLE_DEPRECATED
+   m_page_editor(preferences, m_tooltips),
+#else
+   m_page_editor(preferences),
+#endif
+   m_page_view(preferences),
+   m_page_appearance(preferences),
+   m_page_font(preferences),
+   m_page_behaviour(preferences),
+   m_page_files(*this, preferences, lang_mgr)
 {
         m_notebook.append_page(m_page_editor, _("Editor") );