[gtkmm-documentation] Basics, Simple Example: Synchronize code and description.
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm-documentation] Basics, Simple Example: Synchronize code and description.
- Date: Thu, 16 Aug 2012 14:25:10 +0000 (UTC)
commit 400a2250853aefcadb0f52cb2896392c397e9f11
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date: Thu Aug 16 16:19:12 2012 +0200
Basics, Simple Example: Synchronize code and description.
* docs/tutorial/C/gtkmm-tutorial-in.xml: Minor changes in the Basics chapter,
Simple Example section to make it a correct description of the code.
* examples/book/base/base.cc: Use Gtk::Window instead of ApplicationWindow.
Set the size as the description says. Bug #681323.
ChangeLog | 9 +++++++++
docs/tutorial/C/gtkmm-tutorial-in.xml | 22 +++++++++++++---------
examples/book/base/base.cc | 3 ++-
3 files changed, 24 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 47333a8..1c310b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-08-16 Kjell Ahlstedt <kjell ahlstedt bredband net>
+
+ Basics, Simple Example: Synchronize code and description.
+
+ * docs/tutorial/C/gtkmm-tutorial-in.xml: Minor changes in the Basics chapter,
+ Simple Example section to make it a correct description of the code.
+ * examples/book/base/base.cc: Use Gtk::Window instead of ApplicationWindow.
+ Set the size as the description says. Bug #681323.
+
2012-07-27 Kjell Ahlstedt <kjell ahlstedt bredband net>
I18n and L10n chapter: Fix broken links.
diff --git a/docs/tutorial/C/gtkmm-tutorial-in.xml b/docs/tutorial/C/gtkmm-tutorial-in.xml
index be377fc..9859674 100644
--- a/docs/tutorial/C/gtkmm-tutorial-in.xml
+++ b/docs/tutorial/C/gtkmm-tutorial-in.xml
@@ -322,35 +322,39 @@ suffices.
</para>
<para>
-The next line:
+The next statement:
<programlisting>Glib::RefPtr<Gtk::Application> app = Gtk::Application::create(argc, argv, "org.gtkmm.examples.base");</programlisting>
creates a <classname>Gtk::Application</classname> object, stored in a <classname>RefPtr</classname> smartpointer. This is needed in all >kmm;
-applications. The create() method for this object initializes >kmm;, and checks the
+applications. The <methodname>create()</methodname> method for this object initializes >kmm;, and checks the
arguments passed to your application on the command line, looking for
-standard options such as <literal>-display</literal>. It takes these from the argument list, leaving anything it does not
+standard options such as <literal>--display</literal>. It takes these from the argument list, leaving anything it does not
recognize for your application to parse or ignore. This ensures
that all >kmm; applications accept the same set of standard arguments.
</para>
<para>
-The next two lines of code create and display a window:
+The next two lines of code create a window and set its default (initial) size:
</para>
-<programlisting>Gtk::Window window;</programlisting>
+<programlisting>Gtk::Window window;
+window.set_default_size(200, 200);</programlisting>
<para>
-The last line shows the window and enters the >kmm; main processing loop, which will finish when the window is closed. Your main() function will then return with an appropriate success or error code.
+The last line shows the window and enters the >kmm; main processing loop, which will finish when the window is closed.
+Your <function>main()</function> function will then return with an appropriate success or error code.
</para>
<programlisting>return app->run(window);</programlisting>
<para>
-After putting the source code in <literal>simple.cc</literal> you can compile the above program with gcc using:
+After putting the source code in <literal>simple.cc</literal> you can compile
+the above program with <application>gcc</application> using:
<programlisting>g++ simple.cc -o simple `pkg-config gtkmm-3.0 --cflags --libs`</programlisting>
-Note that you must surround
-the <literal>pkg-config</literal> invocation with backquotes.
+Note that you must surround the <literal>pkg-config</literal> invocation with backquotes.
Backquotes cause the shell to execute the command inside them, and to use
the command's output as part of the command line.
+Note also that <literal>simple.cc</literal> must come before the <literal>pkg-config</literal>
+invocation on the command line.
</para>
</sect1>
diff --git a/examples/book/base/base.cc b/examples/book/base/base.cc
index 37b10f5..67ad54f 100644
--- a/examples/book/base/base.cc
+++ b/examples/book/base/base.cc
@@ -6,7 +6,8 @@ int main(int argc, char *argv[])
Gtk::Application::create(argc, argv,
"org.gtkmm.examples.base");
- Gtk::ApplicationWindow window;
+ Gtk::Window window;
+ window.set_default_size(200, 200);
return app->run(window);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]