[gtkmm] Remove trailing whitespace.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Remove trailing whitespace.
- Date: Mon, 16 May 2016 13:25:26 +0000 (UTC)
commit ba2b373cf140a4220b411097f8a85143fa481418
Author: Murray Cumming <murrayc murrayc com>
Date: Mon May 16 15:24:46 2016 +0200
Remove trailing whitespace.
MSVC_Net2013/gendef/gendef.cc | 14 ++++----
demos/gtk-demo/demowindow.cc | 10 +++---
demos/gtk-demo/example_change_display.cc | 2 +-
demos/gtk-demo/example_iconbrowser.cc | 2 +-
demos/gtk-demo/example_iconview.cc | 46 ++++++++++++++--------------
demos/gtk-demo/example_images.cc | 2 +-
demos/gtk-demo/textwidget.cc | 10 +++---
gdk/src/device.hg | 10 +++---
gdk/src/pixbuf.hg | 4 +-
gdk/src/rectangle.hg | 2 +-
gdk/src/screen.hg | 2 +-
gdk/src/window.hg | 4 +-
gtk/gtkmm/accelkey.cc | 2 +-
gtk/gtkmm/accelkey.h | 14 ++++----
gtk/gtkmm/accelmap.cc | 8 ++--
gtk/gtkmm/accelmap.h | 12 ++++----
gtk/gtkmm/listviewtext.cc | 8 ++--
gtk/gtkmm/listviewtext.h | 4 +-
gtk/gtkmm/radiobuttongroup.h | 2 +-
gtk/gtkmm/stock.h | 4 +-
gtk/gtkmm/stockid.h | 6 ++--
gtk/gtkmm/targetentry.cc | 2 +-
gtk/gtkmm/treemodelcolumn.h | 2 +-
gtk/gtkmm/treeview_private.cc | 2 +-
gtk/src/actiongroup.hg | 4 +-
gtk/src/application.hg | 16 +++++-----
gtk/src/arrow.hg | 2 +-
gtk/src/builder.hg | 6 ++--
gtk/src/button.ccg | 2 +-
gtk/src/calendar.hg | 2 +-
gtk/src/combobox.ccg | 2 +-
gtk/src/combobox.hg | 2 +-
gtk/src/filechooserbutton.ccg | 2 +-
gtk/src/headerbar.hg | 2 +-
gtk/src/iconinfo.hg | 4 +-
gtk/src/iconview.hg | 2 +-
gtk/src/listbox.hg | 6 ++--
gtk/src/listboxrow.hg | 6 ++--
gtk/src/main.hg | 2 +-
gtk/src/menubutton.ccg | 2 +-
gtk/src/menubutton.hg | 2 +-
gtk/src/placessidebar.hg | 2 +-
gtk/src/radiotoolbutton.hg | 2 +-
gtk/src/searchbar.hg | 2 +-
gtk/src/widget.hg | 6 ++--
gtk/src/window.ccg | 2 +-
tests/child_widget_managed/main.cc | 2 +-
tests/delete_cpp_child/main.cc | 8 ++--
tests/dialog/main.cc | 8 ++--
tests/dialog_deletethis/main.cc | 2 +-
tests/main_with_options/main.cc | 28 +++++++++---------
tests/menu_destruction/main.cc | 10 +++---
tests/scrolledwindow/main.cc | 6 ++--
tests/wrap_existing/main.cc | 2 +-
tools/extra_defs_gen/generate_defs_gtk.cc | 2 +-
tools/m4/class_gtkobject.m4 | 2 +-
56 files changed, 161 insertions(+), 161 deletions(-)
---
diff --git a/MSVC_Net2013/gendef/gendef.cc b/MSVC_Net2013/gendef/gendef.cc
index f5719fd..0b02fa3 100644
--- a/MSVC_Net2013/gendef/gendef.cc
+++ b/MSVC_Net2013/gendef/gendef.cc
@@ -22,7 +22,7 @@
/* Modified by Cedric Gustin <cedric gustin gmail com> on 2006/01/13 :
* Redirect the output of dumpbin to dumpbin.out instead of reading the
- * output stream of popen, as it fails with Visual Studio 2005 in
+ * output stream of popen, as it fails with Visual Studio 2005 in
* pre-link build events.
*/
@@ -48,8 +48,8 @@ int main(int argc,char** argv)
dumpbin += argv[i++];
}
- FILE * dump;
-
+ FILE * dump;
+
if( (dump = _popen(dumpbin.c_str(),"r")) == NULL ) {
cerr << "could not popen dumpbin" << endl;
return 3;
@@ -66,8 +66,8 @@ int main(int argc,char** argv)
i=0;
while( !feof(dump)) {
- char buf [65000];
-
+ char buf [65000];
+
if( fgets( buf, 64999, dump ) != NULL ) {
if(!strstr(buf," UNDEF ") && strstr(buf," External ")) {
char *s = strchr(buf,'|') + 1;
@@ -75,9 +75,9 @@ int main(int argc,char** argv)
char *e=s;
while(*e != ' ' && *e != '\t' && *e != '\0' && *e!= '\n') e++;
*e = '\0';
-
+
if(strchr(s,'?')==0 && s[0]=='_' && strchr(s,'@') == 0 )//this is a C export type:
_fct -> fct
- def_file << " " << (s+1) << endl;
+ def_file << " " << (s+1) << endl;
else
if(strchr(s,'?')!=0 && strncmp(s,"??_G",4)!=0 && strncmp(s,"??_E",4)!=0) {
def_file << " " << s << endl;
diff --git a/demos/gtk-demo/demowindow.cc b/demos/gtk-demo/demowindow.cc
index 4da2ecf..26e7e23 100644
--- a/demos/gtk-demo/demowindow.cc
+++ b/demos/gtk-demo/demowindow.cc
@@ -297,11 +297,11 @@ void DemoWindow::load_file(const std::string& filename)
refBufferInfo->apply_tag_by_name("title", start, end);
start = end;
-
+
state++;
}
break;
-
+
case 1:
/* Reading body of info section */
while (isspace (*p))
@@ -315,14 +315,14 @@ void DemoWindow::load_file(const std::string& filename)
else
{
int len;
-
+
while (*p == '*' || isspace (*p))
p++;
len = strlen (p);
while (isspace (*(p + len - 1)))
len--;
-
+
if (len > 0)
{
if (in_para)
@@ -354,7 +354,7 @@ void DemoWindow::load_file(const std::string& filename)
}
else
break;
-
+
case 3:
/* Reading program body */
start = refBufferSource->insert(start, p);
diff --git a/demos/gtk-demo/example_change_display.cc b/demos/gtk-demo/example_change_display.cc
index 443203a..8f90b9a 100644
--- a/demos/gtk-demo/example_change_display.cc
+++ b/demos/gtk-demo/example_change_display.cc
@@ -2,7 +2,7 @@
*
* Demonstrates migrating a window between different displays.
* A display is a mouse and keyboard with some number of
- * associated monitors. The neat thing about having multiple
+ * associated monitors. The neat thing about having multiple
* displays is that they can be on completely separate
* computers, as long as there is a network connection to the
* computer where the application is running.
diff --git a/demos/gtk-demo/example_iconbrowser.cc b/demos/gtk-demo/example_iconbrowser.cc
index 8f46b2e..89383e5 100644
--- a/demos/gtk-demo/example_iconbrowser.cc
+++ b/demos/gtk-demo/example_iconbrowser.cc
@@ -160,7 +160,7 @@ protected:
// Dialog box, showing icon details:
DetailDialog m_details;
-
+
Glib::RefPtr<Glib::Binding> m_binding_search_button_search_entry;
Glib::ustring m_current_context_id;
Glib::RefPtr<Gtk::TreeModelFilter> m_filter_model;
diff --git a/demos/gtk-demo/example_iconview.cc b/demos/gtk-demo/example_iconview.cc
index bcb9050..3023377 100644
--- a/demos/gtk-demo/example_iconview.cc
+++ b/demos/gtk-demo/example_iconview.cc
@@ -23,9 +23,9 @@ protected:
virtual void on_button_up();
virtual void on_button_home();
virtual void on_iconview_item_activated(const Gtk::TreeModel::Path& path);
-
+
virtual int on_model_sort(const Gtk::TreeModel::iterator& a, const Gtk::TreeModel::iterator& b);
-
+
class ModelColumns : public Gtk::TreeModelColumnRecord
{
public:
@@ -39,10 +39,10 @@ protected:
};
const ModelColumns m_columns;
-
+
Glib::RefPtr<Gtk::ListStore> m_model;
Glib::RefPtr<Gdk::Pixbuf> m_refPixbufFile, m_refPixbufFolder;
-
+
std::string m_parent;
//Member widgets:
@@ -69,7 +69,7 @@ Example_IconView::Example_IconView()
set_title("Icon View");
set_default_size(650, 400);
-
+
try
{
m_refPixbufFile = Gdk::Pixbuf::create_from_resource("/iconview/gnome-fs-regular.png");
@@ -79,9 +79,9 @@ Example_IconView::Example_IconView()
{
std::cout << error.what() << std::endl;
}
-
+
m_VBox.pack_start(m_Toolbar, Gtk::PACK_SHRINK);
-
+
m_ButtonUp.set_is_important();
m_ButtonUp.set_sensitive();
m_Toolbar.append(m_ButtonUp);
@@ -89,40 +89,40 @@ Example_IconView::Example_IconView()
m_ButtonHome.set_is_important();
m_ButtonHome.set_sensitive();
m_Toolbar.append(m_ButtonHome);
-
+
m_ScrolledWindow.set_shadow_type(Gtk::SHADOW_ETCHED_IN);
m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
-
+
m_VBox.pack_start(m_ScrolledWindow, Gtk::PACK_EXPAND_WIDGET);
-
+
//Create the data model:
m_model = Gtk::ListStore::create(m_columns);
m_model->set_default_sort_func( sigc::mem_fun(*this, &Example_IconView::on_model_sort) );
m_model->set_sort_column(Gtk::TreeSortable::DEFAULT_SORT_COLUMN_ID, Gtk::SORT_ASCENDING);
-
+
/* and fill it with the contents of '/' */
m_parent = "/";
fill_store();
-
+
m_IconView.set_model(m_model);
m_IconView.set_selection_mode(Gtk::SELECTION_MULTIPLE);
-
+
//Connect signals:
m_ButtonUp.signal_clicked().connect( sigc::mem_fun(*this, &Example_IconView::on_button_up) );
m_ButtonHome.signal_clicked().connect( sigc::mem_fun(*this, &Example_IconView::on_button_home) );
-
+
/* We now set which model columns that correspont to the text
* and pixbuf of each item
*/
m_IconView.set_text_column(m_columns.display_name);
m_IconView.set_pixbuf_column(m_columns.pixbuf);
-
+
m_IconView.signal_item_activated().connect( sigc::mem_fun(*this,
&Example_IconView::on_iconview_item_activated) );
m_ScrolledWindow.add(m_IconView);
-
+
m_IconView.grab_focus();
-
+
add(m_VBox);
show_all();
@@ -136,10 +136,10 @@ int Example_IconView::on_model_sort(const Gtk::TreeModel::iterator& a, const Gtk
Gtk::TreeModel::Row row_a = *a;
Gtk::TreeModel::Row row_b = *b;
-
+
const bool a_is_dir = row_a[m_columns.is_directory];
const bool b_is_dir = row_b[m_columns.is_directory];
-
+
if(!a_is_dir && b_is_dir)
return 1;
else if (a_is_dir && !b_is_dir)
@@ -151,7 +151,7 @@ int Example_IconView::on_model_sort(const Gtk::TreeModel::iterator& a, const Gtk
}
}
-
+
Example_IconView::~Example_IconView()
{
}
@@ -185,7 +185,7 @@ void Example_IconView::fill_store()
try
{
Glib::Dir dir(m_parent); //throws an exception if it fails.
-
+
std::string name = dir.read_name();
while(!name.empty())
{
@@ -204,7 +204,7 @@ void Example_IconView::fill_store()
row[m_columns.is_directory] = is_dir;
row[m_columns.pixbuf] = (is_dir ? m_refPixbufFolder : m_refPixbufFile);
}
-
+
name = dir.read_name();
}
}
@@ -227,7 +227,7 @@ void Example_IconView::on_iconview_item_activated(const Gtk::TreeModel::Path& pa
{
m_parent = filepath;
fill_store();
-
+
/* Sensitize the up button */
m_ButtonUp.set_sensitive();
}
diff --git a/demos/gtk-demo/example_images.cc b/demos/gtk-demo/example_images.cc
index 5742bb5..53fe4c5 100644
--- a/demos/gtk-demo/example_images.cc
+++ b/demos/gtk-demo/example_images.cc
@@ -140,7 +140,7 @@ bool Example_Images::on_timeout()
}
catch(const Glib::Error& error)
{
-
+
Glib::ustring strMsg = "Failure reading image 'alphatest.png': ";
strMsg += error.what();
diff --git a/demos/gtk-demo/textwidget.cc b/demos/gtk-demo/textwidget.cc
index cf80cb5..68a207a 100644
--- a/demos/gtk-demo/textwidget.cc
+++ b/demos/gtk-demo/textwidget.cc
@@ -20,7 +20,7 @@
#include <cstring>
#include "textwidget.h"
#include "pangomm/fontdescription.h"
-
+
using std::strstr;
using std::strncmp;
using std::strlen;
@@ -203,7 +203,7 @@ parse_chars (constpch text,
*state = STATE_NORMAL;
*tag = "comment";
}
-
+
return;
}
@@ -242,7 +242,7 @@ parse_chars (constpch text,
return;
}
}
-
+
/* check for types */
for (i = 0; types[i] != nullptr; i++)
if (!strncmp (text, types[i], strlen (types[i])))
@@ -268,7 +268,7 @@ parse_chars (constpch text,
*end_ptr = text + 1;
*tag = "string";
-
+
while (**end_ptr != '\000')
{
if (**end_ptr == '\"' && !maybe_escape)
@@ -276,7 +276,7 @@ parse_chars (constpch text,
*end_ptr += 1;
return;
}
-
+
if (**end_ptr == '\\')
maybe_escape = true;
else
diff --git a/gdk/src/device.hg b/gdk/src/device.hg
index ef64dd8..b4e000f 100644
--- a/gdk/src/device.hg
+++ b/gdk/src/device.hg
@@ -155,7 +155,7 @@ _DEPRECATE_IFDEF_END
* @newin{3,10}
*/
void get_position(double& x, double& y) const;
-
+
/** Gets the current location of the device in double precision.
* As a slave device coordinates are those of its master pointer,
* this function may not be called on devices of type GDK_DEVICE_TYPE_SLAVE,
@@ -180,11 +180,11 @@ _DEPRECATE_IFDEF_END
/** Obtains the window underneath the device.
* Returns an empty RefPtr if the window tree under the device is not known to GDK (for example, belongs
to another application).
- *
+ *
* As a slave device coordinates are those of its master pointer, This
* function may not be called on devices of type Gdk::DEVICE_TYPE_SLAVE,
* unless there is an ongoing grab on them. See grab().
- *
+ *
* @newin{3,0}
*
* @return The Gdk::Window under the device position.
@@ -193,11 +193,11 @@ _DEPRECATE_IFDEF_END
/** Obtains the window underneath the device.
* Returns an empty RefPtr if the window tree under the device is not known to GDK (for example, belongs
to another application).
- *
+ *
* As a slave device coordinates are those of its master pointer, This
* function may not be called on devices of type Gdk::DEVICE_TYPE_SLAVE,
* unless there is an ongoing grab on them. See grab().
- *
+ *
* @newin{3,0}
*
* @return The Gdk::Window under the device position.
diff --git a/gdk/src/pixbuf.hg b/gdk/src/pixbuf.hg
index cb858a3..0cbf5a4 100644
--- a/gdk/src/pixbuf.hg
+++ b/gdk/src/pixbuf.hg
@@ -103,7 +103,7 @@ protected:
* individual pixels from cairo surfaces. For Gdk::Windows, use the
* constructor that takes a Gdk::Window instead.
*
- * This will create an RGB pixbuf with 8 bits per channel. The pixbuf will contain an alpha channel if the
surface contains one.
+ * This will create an RGB pixbuf with 8 bits per channel. The pixbuf will contain an alpha channel if the
surface contains one.
*
* @param src Surface to copy from.
* @param src_x Source X coordinate within the surface.
@@ -161,7 +161,7 @@ public:
* individual pixels from cairo surfaces. For Gdk::Windows, use the
* create() method that takes a Gdk::Window instead.
*
- * This will create an RGB pixbuf with 8 bits per channel. The pixbuf will contain an alpha channel if the
surface contains one.
+ * This will create an RGB pixbuf with 8 bits per channel. The pixbuf will contain an alpha channel if the
surface contains one.
*
* @param src Surface to copy from.
* @param src_x Source X coordinate within the surface.
diff --git a/gdk/src/rectangle.hg b/gdk/src/rectangle.hg
index d9fdbcd..f77fb0b 100644
--- a/gdk/src/rectangle.hg
+++ b/gdk/src/rectangle.hg
@@ -36,7 +36,7 @@ public:
/** Creates a new rectangle instance with these dimensions.
*/
Rectangle(int x, int y, int width, int height);
-
+
/**
* @newin{3,20}
*/
diff --git a/gdk/src/screen.hg b/gdk/src/screen.hg
index 64c66ba..009d16e 100644
--- a/gdk/src/screen.hg
+++ b/gdk/src/screen.hg
@@ -98,7 +98,7 @@ public:
_WRAP_METHOD(int get_monitor_width_mm(int monitor_num) const, gdk_screen_get_monitor_width_mm)
_WRAP_METHOD(int get_monitor_height_mm(int monitor_num) const, gdk_screen_get_monitor_height_mm)
_WRAP_METHOD(Glib::ustring get_monitor_plug_name(int monitor_num) const, gdk_screen_get_monitor_plug_name)
-
+
_WRAP_METHOD(int get_monitor_scale_factor(int monitor_num), gdk_screen_get_monitor_scale_factor)
_WRAP_METHOD(static Glib::RefPtr<Screen> get_default(), gdk_screen_get_default, refreturn)
diff --git a/gdk/src/window.hg b/gdk/src/window.hg
index 9ec39d5..46534cf 100644
--- a/gdk/src/window.hg
+++ b/gdk/src/window.hg
@@ -209,7 +209,7 @@ public:
_WRAP_METHOD(Glib::RefPtr<const Window> get_toplevel() const, gdk_window_get_toplevel, refreturn,
constversion)
_WRAP_METHOD(Glib::RefPtr<Window> get_device_position(const Glib::RefPtr<const Device>& device, int& x,
int& y, ModifierType& mask) const, gdk_window_get_device_position, refreturn)
-
+
_WRAP_METHOD(Glib::RefPtr<Window> get_device_position(const Glib::RefPtr<const Device>& device, double&
x, double& y, ModifierType& mask) const, gdk_window_get_device_position_double, refreturn)
_WRAP_METHOD(Glib::RefPtr<Window> get_effective_parent(), gdk_window_get_effective_parent, refreturn)
@@ -266,7 +266,7 @@ public:
DragProtocol get_drag_protocol(Glib::RefPtr<Window>& target) const;
/** Finds out the DND protocol supported by a window.
- *
+ *
* @newin{3,0}
*
* @return The supported DND protocol.
diff --git a/gtk/gtkmm/accelkey.cc b/gtk/gtkmm/accelkey.cc
index ccfb520..f45c4e3 100644
--- a/gtk/gtkmm/accelkey.cc
+++ b/gtk/gtkmm/accelkey.cc
@@ -1,7 +1,7 @@
// -*- c++ -*-
/* $Id$ */
-/*
+/*
*
* Copyright 1998-2002 The gtkmm Development Team
*
diff --git a/gtk/gtkmm/accelkey.h b/gtk/gtkmm/accelkey.h
index b9e6c23..0bfa518 100644
--- a/gtk/gtkmm/accelkey.h
+++ b/gtk/gtkmm/accelkey.h
@@ -3,7 +3,7 @@
#define _GTKMM_ACCELKEY_H
/* menu_elems.h
- *
+ *
* Copyright (C) 1998-2002 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -34,7 +34,7 @@ namespace Gtk
*
* By defining accelerator paths you can allow the user of your application
* to change accelerators himself. An example of an accelerator might be
- * "<MainWindow>/File/Open". Modified accelerators may be saved
+ * "<MainWindow>/File/Open". Modified accelerators may be saved
* @see Gtk::AccelMap
* @ingroup Menus
*/
@@ -48,16 +48,16 @@ public:
* @param accel_mods For instance, Gdk::CONTROL_MASK
* @param accel_path For instance, "<MainWindow>/File/Open"
*/
- AccelKey(guint accel_key, Gdk::ModifierType accel_mods,
+ AccelKey(guint accel_key, Gdk::ModifierType accel_mods,
const Glib::ustring& accel_path = "");
-
+
/** AccelKey constructor.
- * @param accelerator For instance, "<control>q" - Use
- * <control>, <shift>, <alt> and <release>.
+ * @param accelerator For instance, "<control>q" - Use
+ * <control>, <shift>, <alt> and <release>.
* Use F1, F2, etc, for function keys.
* @param accel_path For instance, "<MainWindow>/File/Open"
*/
- AccelKey(const Glib::ustring& accelerator,
+ AccelKey(const Glib::ustring& accelerator,
const Glib::ustring& accel_path = Glib::ustring());
AccelKey(const AccelKey& src);
diff --git a/gtk/gtkmm/accelmap.cc b/gtk/gtkmm/accelmap.cc
index 1fca2b7..66b544f 100644
--- a/gtk/gtkmm/accelmap.cc
+++ b/gtk/gtkmm/accelmap.cc
@@ -24,16 +24,16 @@ namespace Gtk
namespace AccelMap
{
-void add_entry(const std::string& accel_path,
- guint accel_key,
+void add_entry(const std::string& accel_path,
+ guint accel_key,
Gdk::ModifierType accel_mods)
{
gtk_accel_map_add_entry(accel_path.c_str(), accel_key,
(GdkModifierType)accel_mods);
}
-bool change_entry(const std::string& accel_path,
- guint accel_key,
+bool change_entry(const std::string& accel_path,
+ guint accel_key,
Gdk::ModifierType accel_mods,
bool replace)
{
diff --git a/gtk/gtkmm/accelmap.h b/gtk/gtkmm/accelmap.h
index 1074c85..cab6b42 100644
--- a/gtk/gtkmm/accelmap.h
+++ b/gtk/gtkmm/accelmap.h
@@ -53,8 +53,8 @@ namespace AccelMap
* @param accel_mods the accelerator modifiers
*
*/
-void add_entry(const std::string& accel_path,
- guint accel_key,
+void add_entry(const std::string& accel_path,
+ guint accel_key,
Gdk::ModifierType accel_mods);
/** Changes the accel_key and accel_mods currently associated with accel_path.
@@ -69,9 +69,9 @@ void add_entry(const std::string& accel_path,
* @param accel_mods the new accelerator modifiers
* @param replace true if other accelerators may be deleted upon conflicts
* @result true if the accelerator could be changed, false otherwise
- */
-bool change_entry(const std::string& accel_path,
- guint accel_key,
+ */
+bool change_entry(const std::string& accel_path,
+ guint accel_key,
Gdk::ModifierType accel_mods,
bool replace);
@@ -79,7 +79,7 @@ bool change_entry(const std::string& accel_path,
* accelerator specifications, and propagates them accordingly.
*
* @param filename a file containing accelerator specifications
- */
+ */
void load(const std::string& filename);
/** Saves current accelerator specifications (accelerator path, key
diff --git a/gtk/gtkmm/listviewtext.cc b/gtk/gtkmm/listviewtext.cc
index c0a529e..9cd44b6 100644
--- a/gtk/gtkmm/listviewtext.cc
+++ b/gtk/gtkmm/listviewtext.cc
@@ -49,16 +49,16 @@ ListViewText::ListViewText(guint columns_count, bool editable, Gtk::SelectionMod
: m_model_columns(columns_count)
{
char column_title[20];
-
+
// Create model
- m_model = Gtk::ListStore::create(m_model_columns);
+ m_model = Gtk::ListStore::create(m_model_columns);
set_model(m_model);
// Append columns
for(guint i = 0; i < columns_count; ++i)
{
//Get text for the number:
- sprintf(column_title, "%d", i);
+ sprintf(column_title, "%d", i);
if(editable)
append_column_editable(column_title, m_model_columns.m_columns[i]);
@@ -128,7 +128,7 @@ Glib::ustring ListViewText::get_text(guint row, guint column) const
g_return_val_if_fail( row < size(), result );
- Gtk::TreeModel::iterator iter = m_model->children()[row];
+ Gtk::TreeModel::iterator iter = m_model->children()[row];
iter->get_value(column, result);
return result;
diff --git a/gtk/gtkmm/listviewtext.h b/gtk/gtkmm/listviewtext.h
index 43f00d4..9f29694 100644
--- a/gtk/gtkmm/listviewtext.h
+++ b/gtk/gtkmm/listviewtext.h
@@ -29,7 +29,7 @@ namespace Gtk
/** A simple listbox which presents some lines of information in columns and lets the user select some of
them.
*
* This is a convenience class, based on Gtk::TreeView, which allows only text values and does not allow
child items.
- * In most cases you will actually need the functionality offered by a real Gtk::TreeView with your own
type-safe
+ * In most cases you will actually need the functionality offered by a real Gtk::TreeView with your own
type-safe
* Gtk::TreeModel::ColumnRecord.
*
* @ingroup Widgets
@@ -86,7 +86,7 @@ public:
/** Change an existing value of cell of the list.
* @param row the number of the row in the list.
- * @param column the number of the column in the row.
+ * @param column the number of the column in the row.
* @param value the new contents of that row and column.
*/
void set_text(guint row, guint column, const Glib::ustring& value);
diff --git a/gtk/gtkmm/radiobuttongroup.h b/gtk/gtkmm/radiobuttongroup.h
index 2c0ed1a..b896a70 100644
--- a/gtk/gtkmm/radiobuttongroup.h
+++ b/gtk/gtkmm/radiobuttongroup.h
@@ -73,7 +73,7 @@ protected:
GSList* group_;
};
-
+
} // namespace Gtk
diff --git a/gtk/gtkmm/stock.h b/gtk/gtkmm/stock.h
index d1001c7..b2091a3 100644
--- a/gtk/gtkmm/stock.h
+++ b/gtk/gtkmm/stock.h
@@ -290,7 +290,7 @@ extern GTKMM_API const Gtk::BuiltinStockID ZOOM_OUT; /*!< @image html gt
/** Add a stock item to the list of registered stock items.
* @param item StockItem to register. If an item already exists with the same
- * stock ID the old item gets replaced.
+ * stock ID the old item gets replaced.
* @deprecated Use icon names instead of StockItem, StockID and BuiltinStockID.
*/
void add(const Gtk::StockItem& item);
@@ -320,7 +320,7 @@ bool lookup(const Gtk::StockID& stock_id, Glib::RefPtr<Gtk::IconSet>& iconset);
*
* @return <tt>true</tt> if the item was found - <tt>false</tt> otherwise
* @deprecated Use icon names instead of StockItem, StockID and BuiltinStockID.
- */
+ */
bool lookup(const Gtk::StockID& stock_id, Gtk::IconSize size, Gtk::Image& image);
/** Retrieves a list of all known stock IDs added to an IconFactory or registered with Stock::add().
diff --git a/gtk/gtkmm/stockid.h b/gtk/gtkmm/stockid.h
index 5b1e4c6..990370e 100644
--- a/gtk/gtkmm/stockid.h
+++ b/gtk/gtkmm/stockid.h
@@ -58,7 +58,7 @@ public:
* @param id string representation of the stock id. Usually something like "gtk-about".
*
* If id is 0 an empty StockID will be created.
- */
+ */
explicit StockID(const char* id);
~StockID() noexcept;
@@ -72,9 +72,9 @@ public:
*/
StockID& operator=(const StockID& other);
- /** This typedef is just to make it more obvious that
+ /** This typedef is just to make it more obvious that
* our operator const void* should be used like operator bool().
- */
+ */
typedef const void* BoolExpr;
/** Tests whether the StockID is not empty.
diff --git a/gtk/gtkmm/targetentry.cc b/gtk/gtkmm/targetentry.cc
index fa80479..129c789 100644
--- a/gtk/gtkmm/targetentry.cc
+++ b/gtk/gtkmm/targetentry.cc
@@ -56,7 +56,7 @@ TargetEntry::TargetEntry(const TargetEntry& src)
TargetEntry::~TargetEntry() noexcept
{
- //See https://bugzilla.gnome.org/show_bug.cgi?id=565665#c10 about the
+ //See https://bugzilla.gnome.org/show_bug.cgi?id=565665#c10 about the
//const_cast<>.
g_free(const_cast<char*>(gobject_.target));
}
diff --git a/gtk/gtkmm/treemodelcolumn.h b/gtk/gtkmm/treemodelcolumn.h
index b6c9a38..e81fc2d 100644
--- a/gtk/gtkmm/treemodelcolumn.h
+++ b/gtk/gtkmm/treemodelcolumn.h
@@ -79,7 +79,7 @@ public:
* you're free to pass it around by value.
*/
void add(TreeModelColumnBase& column);
-
+
unsigned int size() const;
const GType* types() const;
diff --git a/gtk/gtkmm/treeview_private.cc b/gtk/gtkmm/treeview_private.cc
index ab793cb..2840a3d 100644
--- a/gtk/gtkmm/treeview_private.cc
+++ b/gtk/gtkmm/treeview_private.cc
@@ -40,7 +40,7 @@ void SignalProxy_CellData_gtk_callback(GtkTreeViewColumn*, GtkCellRenderer* cell
if(!cppiter->get_model_gobject())
{
g_warning("SignalProxy_CellData_gtk_callback() The cppiter has no model\n");
- return;
+ return;
}
(*the_slot)(Glib::wrap(cell, false), cppiter);
diff --git a/gtk/src/actiongroup.hg b/gtk/src/actiongroup.hg
index 8358f62..6962e81 100644
--- a/gtk/src/actiongroup.hg
+++ b/gtk/src/actiongroup.hg
@@ -55,10 +55,10 @@ public:
_WRAP_METHOD(void set_sensitive(bool sensitive = true), gtk_action_group_set_sensitive)
_WRAP_METHOD(bool get_visible() const, gtk_action_group_get_visible)
_WRAP_METHOD(void set_visible(bool visible = true), gtk_action_group_set_visible)
-
+
_WRAP_METHOD(Glib::RefPtr<AccelGroup> get_accel_group(), gtk_action_group_get_accel_group, refreturn)
_WRAP_METHOD(Glib::RefPtr<const AccelGroup> get_accel_group() const, gtk_action_group_get_accel_group,
refreturn, constversion)
-
+
_WRAP_METHOD(void set_accel_group (const Glib::RefPtr<AccelGroup>& accel_group),
gtk_action_group_set_accel_group)
_WRAP_METHOD(Glib::RefPtr<Action> get_action(const Glib::ustring& action_name),
gtk_action_group_get_action, refreturn)
diff --git a/gtk/src/application.hg b/gtk/src/application.hg
index 5926bec..d89d6bc 100644
--- a/gtk/src/application.hg
+++ b/gtk/src/application.hg
@@ -120,7 +120,7 @@ protected:
explicit Application(const Glib::ustring& application_id = Glib::ustring(), Gio::ApplicationFlags flags =
Gio::APPLICATION_FLAGS_NONE);
_IGNORE(gtk_application_new)
_IGNORE(gtk_application_window_new)
-
+
//This constructor does not correspond to anything in the C API.
//We added it so we can choose to always initialize gtkmm as early as possible.
@@ -342,11 +342,11 @@ public:
_WRAP_METHOD(void set_accels_for_action(const Glib::ustring& detailed_action_name, const
std::vector<Glib::ustring>& accels), gtk_application_set_accels_for_action)
/** Sets a keyboard accelerator that will trigger the
- * given action. It will be the primary
+ * given action. It will be the primary
* accelerator, which may be displayed in the UI.
*
* See unset_accels_for_action().
- *
+ *
* @param detailed_action_name A detailed action name, specifying an action
* and target to associate accelerators with.
* @param accel An accelerator in the format understood by gtk_accelerator_parse().
@@ -357,7 +357,7 @@ public:
/** Unsets a keyboard accelerator that will trigger the
* given action. See set_accels_for_action() and set_accel_for_action().
- *
+ *
* @param detailed_action_name A detailed action name, specifying an action
* and target to associate accelerators with.
*
@@ -380,16 +380,16 @@ public:
private:
/** This is just a way to call Glib::init() (which calls g_type_init()) before
- * calling application_class_.init(), so that
+ * calling application_class_.init(), so that
* gtk_application_get_type() will always succeed.
* See https://bugzilla.gnome.org/show_bug.cgi?id=639925
*/
const Glib::Class& custom_class_init();
-
+
void on_activate_add_and_show_main_window(Window* window);
void on_window_hide(Window* window);
-
- //We need these to call g_application_run(),
+
+ //We need these to call g_application_run(),
//even if we have already called gtk_init().
int m_argc;
char** m_argv;
diff --git a/gtk/src/arrow.hg b/gtk/src/arrow.hg
index 0be479d..7ef4643 100644
--- a/gtk/src/arrow.hg
+++ b/gtk/src/arrow.hg
@@ -44,7 +44,7 @@ namespace Gtk
*
* @ingroup Widgets
* @deprecated You should instead use a Gtk::Image with a
- * suitable icon name, such as “pan-down-symbolic“. When replacing
+ * suitable icon name, such as “pan-down-symbolic“. When replacing
* Gtk::Arrow by an image, pay attention to the fact that Gtk::Arrow automatically
* flips between Gtk::ARROW_LEFT and Gtk::ARROW_RIGHT,
* depending on the text direction. To get the same effect with an image,
diff --git a/gtk/src/builder.hg b/gtk/src/builder.hg
index db042d6..dccbd0e 100644
--- a/gtk/src/builder.hg
+++ b/gtk/src/builder.hg
@@ -413,7 +413,7 @@ public:
/** Add @a widget to the builder object pool so it can be referenced just like any
* other object built by builder.
- *
+ *
* @newin{3,12}
*
* @param name The name of the widget exposed to the builder.
@@ -425,7 +425,7 @@ public:
// A Builder can contain objects that don't derive from Buildable,
// for instance if objects have been added with expose_object().
/** Gets the object named @a name.
- *
+ *
* @newin{2,12}
*
* @param name Name of object to get.
@@ -433,7 +433,7 @@ public:
*/
_WRAP_METHOD(Glib::RefPtr<Glib::Object> get_object(const Glib::ustring& name), gtk_builder_get_object,
refreturn)
/** Gets the object named @a name.
- *
+ *
* @newin{3,8}
*
* @param name Name of object to get.
diff --git a/gtk/src/button.ccg b/gtk/src/button.ccg
index 462da5d..82fd22e 100644
--- a/gtk/src/button.ccg
+++ b/gtk/src/button.ccg
@@ -55,7 +55,7 @@ void Button::set_image_from_icon_name(const Glib::ustring& icon_name, IconSize s
// GtkButton:focus-on-click has been removed from gtk+.
// TODO: At ABI-break, remove it from gtkmm.
#ifndef GTKMM_DISABLE_DEPRECATED
-Glib::PropertyProxy< bool > Button::property_focus_on_click()
+Glib::PropertyProxy< bool > Button::property_focus_on_click()
{
return Glib::PropertyProxy< bool >(this, "focus-on-click");
}
diff --git a/gtk/src/calendar.hg b/gtk/src/calendar.hg
index 9af5767..1729286 100644
--- a/gtk/src/calendar.hg
+++ b/gtk/src/calendar.hg
@@ -114,7 +114,7 @@ public:
_WRAP_METHOD(int get_detail_width_chars() const, gtk_calendar_get_detail_width_chars)
_WRAP_METHOD(int get_detail_height_rows() const, gtk_calendar_get_detail_height_rows)
-
+
_WRAP_METHOD(bool get_day_is_marked(guint day) const, gtk_calendar_get_day_is_marked)
_WRAP_SIGNAL(void month_changed(), "month_changed")
diff --git a/gtk/src/combobox.ccg b/gtk/src/combobox.ccg
index ba1fcaa..13e4c05 100644
--- a/gtk/src/combobox.ccg
+++ b/gtk/src/combobox.ccg
@@ -123,7 +123,7 @@ Glib::ustring ComboBox::get_entry_text() const
// GtkComboBox:focus-on-click has been removed from gtk+.
// TODO: At ABI-break, remove it from gtkmm.
#ifndef GTKMM_DISABLE_DEPRECATED
-Glib::PropertyProxy< bool > ComboBox::property_focus_on_click()
+Glib::PropertyProxy< bool > ComboBox::property_focus_on_click()
{
return Glib::PropertyProxy< bool >(this, "focus-on-click");
}
diff --git a/gtk/src/combobox.hg b/gtk/src/combobox.hg
index df49de4..62cc24c 100644
--- a/gtk/src/combobox.hg
+++ b/gtk/src/combobox.hg
@@ -193,7 +193,7 @@ public:
/** Changes the active row of the combo box to the one that has an ID equal to
* @a active_id.
*
- * If property_id_column() is unset or if no row has the given ID then the function
+ * If property_id_column() is unset or if no row has the given ID then the function
* does nothing and returns false.
*
* @param active_id The ID of the row that should be set to active.
diff --git a/gtk/src/filechooserbutton.ccg b/gtk/src/filechooserbutton.ccg
index a5ee9e4..927d007 100644
--- a/gtk/src/filechooserbutton.ccg
+++ b/gtk/src/filechooserbutton.ccg
@@ -30,7 +30,7 @@ FileChooserButton::FileChooserButton(FileChooserAction action)
// GtkFileChooserButton:focus-on-click has been removed from gtk+.
// TODO: At ABI-break, remove it from gtkmm.
#ifndef GTKMM_DISABLE_DEPRECATED
-Glib::PropertyProxy< bool > FileChooserButton::property_focus_on_click()
+Glib::PropertyProxy< bool > FileChooserButton::property_focus_on_click()
{
return Glib::PropertyProxy< bool >(this, "focus-on-click");
}
diff --git a/gtk/src/headerbar.hg b/gtk/src/headerbar.hg
index be39813..5afba89 100644
--- a/gtk/src/headerbar.hg
+++ b/gtk/src/headerbar.hg
@@ -65,7 +65,7 @@ public:
_WRAP_METHOD(bool get_show_close_button() const, gtk_header_bar_get_show_close_button)
_WRAP_METHOD(void set_decoration_layout(const Glib::ustring& layout), gtk_header_bar_set_decoration_layout)
-
+
/** Unset the decoration layout.
* See set_decoration_layout().
*/
diff --git a/gtk/src/iconinfo.hg b/gtk/src/iconinfo.hg
index ba56958..753e95d 100644
--- a/gtk/src/iconinfo.hg
+++ b/gtk/src/iconinfo.hg
@@ -116,12 +116,12 @@ _DEPRECATE_IFDEF_END
* This allows loading symbolic icons that will match the system theme.
*
* @param style A StyleContext.
- * @param was_symbolic Whether the loaded icon was a symbolic one and whether the fg color was applied to
it.
+ * @param was_symbolic Whether the loaded icon was a symbolic one and whether the fg color was applied to
it.
*/
Glib::RefPtr<Gdk::Pixbuf> load_symbolic(const Glib::RefPtr<StyleContext>& style, bool& was_symbolic);
_IGNORE(gtk_icon_info_load_symbolic_for_context)
- //TODO: When we can break ABI: Rename these to load_symbolic_async(), or rename load_symbolic(context) to
load_symbolic_for_context() for consistency.
+ //TODO: When we can break ABI: Rename these to load_symbolic_async(), or rename load_symbolic(context) to
load_symbolic_for_context() for consistency.
/** Asynchronously load, render and scale a symbolic icon previously looked up from the icon theme using
Gtk::IconTheme::lookup_icon().
* For more details, see load_symbolic() which is the synchronous version of this call.
*
diff --git a/gtk/src/iconview.hg b/gtk/src/iconview.hg
index d15e388..dd1589d 100644
--- a/gtk/src/iconview.hg
+++ b/gtk/src/iconview.hg
@@ -145,7 +145,7 @@ public:
bool get_visible_range(TreeModel::Path& start_path, TreeModel::Path& end_path) const;
_IGNORE(gtk_icon_view_get_visible_range)
-
+
_WRAP_METHOD(void set_activate_on_single_click(bool single = true),
gtk_icon_view_set_activate_on_single_click)
_WRAP_METHOD(bool get_activate_on_single_click() const, gtk_icon_view_get_activate_on_single_click)
diff --git a/gtk/src/listbox.hg b/gtk/src/listbox.hg
index ada6077..3bbcc23 100644
--- a/gtk/src/listbox.hg
+++ b/gtk/src/listbox.hg
@@ -101,7 +101,7 @@ public:
/** Append a widget to the list. If a sort function is set, the widget will
* actually be inserted at the calculated position and this function has the
* same effect of Gtk::Container::add().
- *
+ *
* @newin{3,10}
*
* @param child The Gtk::Widget to add.
@@ -117,7 +117,7 @@ public:
_WRAP_METHOD(void select_row(ListBoxRow& row), gtk_list_box_select_row)
/** Unselects the currently selected row, if any.
- *
+ *
* @newin{3,10}
*/
void unselect_row();
@@ -125,7 +125,7 @@ public:
_WRAP_METHOD(void set_placeholder(Widget& placeholder), gtk_list_box_set_placeholder)
/** Removes the placeholder widget, if any.
- *
+ *
* @newin{3,10}
*/
void unset_placeholder();
diff --git a/gtk/src/listboxrow.hg b/gtk/src/listboxrow.hg
index d745660..f25a19f 100644
--- a/gtk/src/listboxrow.hg
+++ b/gtk/src/listboxrow.hg
@@ -38,7 +38,7 @@ public:
/** Sets the current header of the ListBoxRow. This is only allowed to be called
* from a ListBox::SlotUpdateHeader. It will replace any existing
* header in the row, and be shown in front of the row in the ListBox.
- *
+ *
* @newin{3,10}
*
* @param header The header.
@@ -55,7 +55,7 @@ public:
/** Returns the current header of the ListBoxRow. This can be used
* in a ListBox::SlotUpdateHeader to see if there is a header
* set already, and if so to update the state of it.
- *
+ *
* @newin{3,10}
*
* @return The current header, or <tt>0</tt> if none.
@@ -65,7 +65,7 @@ public:
/** Returns the current header of the ListBoxRow. This can be used
* in a ListBox::SlotUpdateHeader to see if there is a header
* set already, and if so to update the state of it.
- *
+ *
* @newin{3,10}
*
* @return The current header, or <tt>0</tt> if none.
diff --git a/gtk/src/main.hg b/gtk/src/main.hg
index ea39660..5622887 100644
--- a/gtk/src/main.hg
+++ b/gtk/src/main.hg
@@ -204,7 +204,7 @@ _DEPRECATE_IFDEF_END
//TODO: Move these general methods out of Main when we really remove Main,
//one day when Gtk::Application can really do everything, which should probably
- //include handling OptionContext properly. murrayc.
+ //include handling OptionContext properly. murrayc.
//This attempts to provide the same functionality as gtk_get_option_group():
/** Add a Glib::OptionGroup, for the commandline arguments recognized
diff --git a/gtk/src/menubutton.ccg b/gtk/src/menubutton.ccg
index a490c2f..b308539 100644
--- a/gtk/src/menubutton.ccg
+++ b/gtk/src/menubutton.ccg
@@ -43,7 +43,7 @@ void MenuButton::unset_menu_model()
}
#ifndef GTKMM_DISABLE_DEPRECATED
-Glib::PropertyProxy< Menu* > MenuButton::property_menu()
+Glib::PropertyProxy< Menu* > MenuButton::property_menu()
{
return property_popup();
}
diff --git a/gtk/src/menubutton.hg b/gtk/src/menubutton.hg
index da33fdf..6b60342 100644
--- a/gtk/src/menubutton.hg
+++ b/gtk/src/menubutton.hg
@@ -43,7 +43,7 @@ public:
_CTOR_DEFAULT
-
+
_WRAP_METHOD(void set_menu(Menu& menu), gtk_menu_button_set_popup, deprecated "Use set_popup() instead.")
_DEPRECATE_IFDEF_START
diff --git a/gtk/src/placessidebar.hg b/gtk/src/placessidebar.hg
index 67576f3..e9291e2 100644
--- a/gtk/src/placessidebar.hg
+++ b/gtk/src/placessidebar.hg
@@ -84,7 +84,7 @@ public:
// transfer full
// get_location returns a new Gio::File; modifiying the returned value does not modify the places sidebar
- _WRAP_METHOD(Glib::RefPtr<Gio::File> get_location() const, gtk_places_sidebar_get_location)
+ _WRAP_METHOD(Glib::RefPtr<Gio::File> get_location() const, gtk_places_sidebar_get_location)
_WRAP_METHOD(void set_show_desktop(bool show_desktop = true), gtk_places_sidebar_set_show_desktop)
_WRAP_METHOD(bool get_show_desktop() const, gtk_places_sidebar_get_show_desktop)
diff --git a/gtk/src/radiotoolbutton.hg b/gtk/src/radiotoolbutton.hg
index 77dcd94..0acdb6f 100644
--- a/gtk/src/radiotoolbutton.hg
+++ b/gtk/src/radiotoolbutton.hg
@@ -103,7 +103,7 @@ public:
/** Adds the radio tool button to @a group, removing it from the group it belonged to before.
* You can obtain a suitable group from another radio tool button by using get_group().
- *
+ *
* @newin{2,4}
*
* @param group An existing radio button group.
diff --git a/gtk/src/searchbar.hg b/gtk/src/searchbar.hg
index aaef373..1e611b9 100644
--- a/gtk/src/searchbar.hg
+++ b/gtk/src/searchbar.hg
@@ -51,7 +51,7 @@ public:
/** Creates a Gtk::SearchBar.
*
- * You will need to tell it about which widget is going to be your
+ * You will need to tell it about which widget is going to be your
* text entry using Gtk::SearchBar::connect_entry().
*/
_CTOR_DEFAULT
diff --git a/gtk/src/widget.hg b/gtk/src/widget.hg
index d375453..8cbe256 100644
--- a/gtk/src/widget.hg
+++ b/gtk/src/widget.hg
@@ -170,7 +170,7 @@ public:
// gtk_widget_reparent() is deprecated, but we want to keep Gtk::Widget::reparent().
/** Moves a widget from one Gtk::Container to another, handling reference
* count issues to avoid destroying the widget.
- *
+ *
* @param new_parent A Gtk::Container to move the widget into.
*/
void reparent(Widget& new_parent);
@@ -292,7 +292,7 @@ public:
_WRAP_METHOD(void set_allocation(const Allocation& allocation), gtk_widget_set_allocation)
_WRAP_METHOD(void set_clip(const Allocation& clip), gtk_widget_set_clip)
-
+
/** Retrieves the widget’s clip area.
*
* The clip area is the area in which all of the widget's drawing will
@@ -640,7 +640,7 @@ _DEPRECATE_IFDEF_END
/** Removes a group from the widget.
* See insert_action_group().
- *
+ *
* @param name The prefix for actions.
*
* @newin{3,10}
diff --git a/gtk/src/window.ccg b/gtk/src/window.ccg
index 5f8767e..085a221 100644
--- a/gtk/src/window.ccg
+++ b/gtk/src/window.ccg
@@ -205,7 +205,7 @@ void Window::unset_application()
#ifndef GTKMM_DISABLE_DEPRECATED
// This works. The base class GtkWidget contains the opacity property.
-Glib::PropertyProxy< double > Window::property_opacity()
+Glib::PropertyProxy< double > Window::property_opacity()
{
return Glib::PropertyProxy< double >(this, "opacity");
}
diff --git a/tests/child_widget_managed/main.cc b/tests/child_widget_managed/main.cc
index 6994336..04895ce 100644
--- a/tests/child_widget_managed/main.cc
+++ b/tests/child_widget_managed/main.cc
@@ -33,7 +33,7 @@ ExampleWindow::ExampleWindow()
m_button = manage(new MyButton);
add(*m_button);
-
+
show_all_children();
}
diff --git a/tests/delete_cpp_child/main.cc b/tests/delete_cpp_child/main.cc
index c2e0eb1..72ae7fb 100644
--- a/tests/delete_cpp_child/main.cc
+++ b/tests/delete_cpp_child/main.cc
@@ -4,12 +4,12 @@
#include <gtkmm/window.h>
#include <gtkmm/main.h>
-class AppWindow
+class AppWindow
: public Gtk::Window
{
-public:
+public:
AppWindow();
-
+
private:
void on_button_clicked();
@@ -26,7 +26,7 @@ AppWindow::AppWindow()
vbox->pack_start(*button, Gtk::PACK_SHRINK);
-
+
//m_label = manage (new Gtk::Label ("test"));
m_label = new Gtk::Label("test");
g_warning("m_label -> ref_count: %d\n", G_OBJECT(m_label->gobj())->ref_count);
diff --git a/tests/dialog/main.cc b/tests/dialog/main.cc
index 2f5b999..9d2e097 100644
--- a/tests/dialog/main.cc
+++ b/tests/dialog/main.cc
@@ -4,12 +4,12 @@
#include <gtkmm/window.h>
#include <gtkmm/main.h>
-class AppWindow
+class AppWindow
: public Gtk::Window
{
-public:
+public:
AppWindow ();
-
+
private:
void on_button_clicked();
@@ -26,7 +26,7 @@ AppWindow::AppWindow()
vbox->pack_start(*button, Gtk::PACK_SHRINK);
-
+
//m_label = manage (new Gtk::Label ("test"));
m_label = new Gtk::Label ("test");
g_warning("m_label -> ref_count: %d\n", G_OBJECT(m_label->gobj())->ref_count);
diff --git a/tests/dialog_deletethis/main.cc b/tests/dialog_deletethis/main.cc
index 344ab92..ad0f39c 100644
--- a/tests/dialog_deletethis/main.cc
+++ b/tests/dialog_deletethis/main.cc
@@ -53,4 +53,4 @@ int main (int argc, char **argv)
return app->run();
}
-
+
diff --git a/tests/main_with_options/main.cc b/tests/main_with_options/main.cc
index 66e3f11..530466f 100644
--- a/tests/main_with_options/main.cc
+++ b/tests/main_with_options/main.cc
@@ -22,15 +22,15 @@
class ExampleOptionGroup : public Glib::OptionGroup
-{
+{
public:
ExampleOptionGroup();
bool on_pre_parse(Glib::OptionContext& context, Glib::OptionGroup& group) override;
bool on_post_parse(Glib::OptionContext& context, Glib::OptionGroup& group) override;
void on_error(Glib::OptionContext& context, Glib::OptionGroup& group) override;
-
- //These int instances should live as long as the OptionGroup to which they are added,
+
+ //These int instances should live as long as the OptionGroup to which they are added,
//and as long as the OptionContext to which those OptionGroups are added.
int m_arg_foo;
std::string m_arg_filename;
@@ -48,24 +48,24 @@ ExampleOptionGroup::ExampleOptionGroup()
entry1.set_short_name('f');
entry1.set_description("The Foo");
add_entry(entry1, m_arg_foo);
-
+
Glib::OptionEntry entry2;
entry2.set_long_name("file");
entry2.set_short_name('F');
entry2.set_description("The Filename");
add_entry_filename(entry2, m_arg_filename);
-
+
Glib::OptionEntry entry3;
entry3.set_long_name("goo");
entry3.set_short_name('g');
entry3.set_description("The Goo");
add_entry(entry3, m_arg_goo);
-
+
Glib::OptionEntry entry4;
entry4.set_long_name("activate_something");
entry4.set_description("Activate something");
add_entry(entry4, m_arg_boolean);
-
+
Glib::OptionEntry entry5;
entry5.set_long_name("list");
entry5.set_short_name('l');
@@ -95,25 +95,25 @@ int main(int argc, char *argv[])
//This example should be executed like so:
//./example --foo=1 --bar=2 --goo=abc
//./example --help
-
+
Glib::OptionContext context;
-
+
ExampleOptionGroup group;
context.set_main_group(group);
-
+
try
{
Glib::RefPtr<Gtk::Application> app =
Gtk::Application::create(argc, argv);
-
+
//Here we can see the parsed values of our custom command-line arguments:
std::cout << "parsed values: " << std::endl <<
- " foo = " << group.m_arg_foo << std::endl <<
+ " foo = " << group.m_arg_foo << std::endl <<
" filename = " << group.m_arg_filename << std::endl <<
" activate_something = " << (group.m_arg_boolean ? "enabled" : "disabled") << std::endl <<
" goo = " << group.m_arg_goo << std::endl;
-
+
//This one shows the results of multiple instance of the same option, such as --list=1 --list=a --list=b
std::cout << " list = ";
for(auto str : group.m_arg_list)
@@ -121,7 +121,7 @@ int main(int argc, char *argv[])
std::cout << str << ", ";
}
std::cout << std::endl;
-
+
//Any standard GTK+ command-line arguments will have an effect on this window:
//Try --name="bobble" to change the window's title to "bobble", for instance.
diff --git a/tests/menu_destruction/main.cc b/tests/menu_destruction/main.cc
index fb21fcc..4b1df72 100644
--- a/tests/menu_destruction/main.cc
+++ b/tests/menu_destruction/main.cc
@@ -11,7 +11,7 @@ void on_destroyed_menuderived(GtkWidget*, gpointer)
std::cout << "on_destroyed_menuderived" << std::endl;
}
-//Previously, this derived from a Gtk::ComboBox,
+//Previously, this derived from a Gtk::ComboBox,
//and that might have been necessary to trigger the bug at the time,
//but ComboBox is now deprecated.
class ComboBoxTextDerived : public Gtk::ComboBoxText
@@ -22,7 +22,7 @@ public:
g_signal_connect (gobj(), "destroy",
G_CALLBACK (on_destroyed_ComboBoxderived), NULL);
}
-
+
~ComboBoxTextDerived()
{
//remove_menu();
@@ -38,11 +38,11 @@ public:
g_signal_connect (gobj(), "destroy",
G_CALLBACK (on_destroyed_menuderived), NULL);
}
-
+
~MenuDerived()
{
std::cout << "~MenuDerived() 1" << std::endl;
-
+
std::cout << "~MenuDerived() 2" << std::endl;
}
@@ -57,7 +57,7 @@ public:
std::cout << "~test_window()1" << std::endl;
}
-
+
protected:
//Gtk::MenuItem m_MenuItem;
diff --git a/tests/scrolledwindow/main.cc b/tests/scrolledwindow/main.cc
index ef93f1a..61b16df 100644
--- a/tests/scrolledwindow/main.cc
+++ b/tests/scrolledwindow/main.cc
@@ -38,9 +38,9 @@ public:
g_signal_connect (G_OBJECT(m_ScrolledWindow.get_child()->gobj()), "destroy",
G_CALLBACK(on_viewport_destroyed), NULL);
g_signal_connect (G_OBJECT(m_pLabel.gobj()), "destroy", G_CALLBACK(on_gtklabel_destroyed), NULL);
-
+
}
-
+
virtual ~Instance()
{
printf("~Instance() 1\n");
@@ -56,7 +56,7 @@ protected:
};
int main ( int argc, char *argv[] ) {
-
+
Glib::RefPtr<Gtk::Application> app =
Gtk::Application::create(argc, argv);
diff --git a/tests/wrap_existing/main.cc b/tests/wrap_existing/main.cc
index 31c66c0..5167291 100644
--- a/tests/wrap_existing/main.cc
+++ b/tests/wrap_existing/main.cc
@@ -29,7 +29,7 @@ int main(int argc, char**argv)
//Set a quark and a callback:
initialize_quark();
int a = 0; // (This doesn't work unless we have a non-null value for the 3rd parameter.)
- g_object_set_qdata_full((GObject*)pBox->gobj(), quark_test, &a, &on_object_qdata_destroyed);
+ g_object_set_qdata_full((GObject*)pBox->gobj(), quark_test, &a, &on_object_qdata_destroyed);
g_warning("vbox refcount=%d", G_OBJECT(pBox->gobj())->ref_count);
diff --git a/tools/extra_defs_gen/generate_defs_gtk.cc b/tools/extra_defs_gen/generate_defs_gtk.cc
index 8e36053..5fc68f2 100644
--- a/tools/extra_defs_gen/generate_defs_gtk.cc
+++ b/tools/extra_defs_gen/generate_defs_gtk.cc
@@ -170,7 +170,7 @@ int main(int argc, char** argv)
#endif
<< get_defs( GTK_TYPE_POPOVER )
<< get_defs( GTK_TYPE_POPOVER_MENU )
-#if !defined(G_OS_WIN32)
+#if !defined(G_OS_WIN32)
<< get_defs( GTK_TYPE_PRINTER )
<< get_defs( GTK_TYPE_PRINT_JOB )
#endif /* G_OS_WIN32 */
diff --git a/tools/m4/class_gtkobject.m4 b/tools/m4/class_gtkobject.m4
index 8b1f541..f258491 100644
--- a/tools/m4/class_gtkobject.m4
+++ b/tools/m4/class_gtkobject.m4
@@ -90,7 +90,7 @@ _SECTION(SECTION_HEADER3)
namespace Glib
{
/** A Glib::wrap() method for this object.
- *
+ *
* @param object The C instance.
* @param take_copy False if the result should take ownership of the C instance. True if it should take a
new copy or ref.
* @result A C++ instance that wraps this C instance.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
