[gtkmm] Main: Undeprecate init_gtkmm_internals().
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Main: Undeprecate init_gtkmm_internals().
- Date: Thu, 15 Mar 2012 12:11:31 +0000 (UTC)
commit c5626958ee4f80fe514a9c3f84a515980bc0441f
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Mar 15 12:52:42 2012 +0100
Main: Undeprecate init_gtkmm_internals().
* gtk/src/main.[hg|ccg]: This is used, for instance,
by gtksourceviewmm's init() method, and I cannot think of any
replacement.
ChangeLog | 8 ++++++++
gtk/src/main.ccg | 4 ++++
gtk/src/main.hg | 6 ++----
3 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6b1a9b7..9da47e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2012-03-15 Murray Cumming <murrayc murrayc com>
+ Main: Undeprecate init_gtkmm_internals().
+
+ * gtk/src/main.[hg|ccg]: This is used, for instance,
+ by gtksourceviewmm's init() method, and I cannot think of any
+ replacement.
+
+2012-03-15 Murray Cumming <murrayc murrayc com>
+
Fix some missing sentinel warnings found by clang++
* gdk/src/pixbuf.ccg:
diff --git a/gtk/src/main.ccg b/gtk/src/main.ccg
index 64062ad..6579db2 100644
--- a/gtk/src/main.ccg
+++ b/gtk/src/main.ccg
@@ -327,6 +327,8 @@ Main::Main(int& argc, char**& argv, Glib::OptionContext& option_context)
}
}
+_DEPRECATE_IFDEF_END
+
// This is a static method so that it can be used before Main is instantiated,
// for instance in Gnome::canvas_init(). But if you use this method, you
// _must_ have a Gtk::Main, so that Main::~Main() is called to clean this up
@@ -354,6 +356,8 @@ void Main::init_gtkmm_internals()
}
}
+_DEPRECATE_IFDEF_START
+
void Main::add_gtk_option_group(Glib::OptionContext& option_context, bool open_default_display)
{
//Get the option group:
diff --git a/gtk/src/main.hg b/gtk/src/main.hg
index f0dc988..a8e1c26 100644
--- a/gtk/src/main.hg
+++ b/gtk/src/main.hg
@@ -263,16 +263,14 @@ _DEPRECATE_IFDEF_START
* @deprecated Key snooping should not be done. Events should be handled by widgets.
*/
static KeySnooperSig& signal_key_snooper();
+_DEPRECATE_IFDEF_END
/** Initialize the table of wrap_new functions.
* This doesn't need an instance of Gtk::Main.
- *
- * @deprecated Use Gtk::Application instead.
+ * This would usually only be used by the init() methods of libraries that depend on gtkmm.
*/
static void init_gtkmm_internals();
-_DEPRECATE_IFDEF_END
-
protected:
_DEPRECATE_IFDEF_START
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]