[gtkmm] Update for the latest gtk+4 (remove Gdk::Screen and Gdk::Visual)
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Update for the latest gtk+4 (remove Gdk::Screen and Gdk::Visual)
- Date: Thu, 2 Nov 2017 15:46:41 +0000 (UTC)
commit cc3e5bc58e7498fac2ba6b91bad732502809667d
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date: Thu Nov 2 16:44:16 2017 +0100
Update for the latest gtk+4 (remove Gdk::Screen and Gdk::Visual)
Gdk::Screen and Gdk::Visual are removed. Gdk::Screen has been replaced by
Gdk::Display in many methods. Many methods have changed names, typically
set_screen() -> set_display(), get_screen() -> get_display() and
property_screen() -> property_display().
.gitignore | 4 --
demos/gtk-demo/example_change_display.cc | 28 +++++------
gdk/gdkmm.h | 2 -
gdk/src/applaunchcontext.ccg | 2 +
gdk/src/applaunchcontext.hg | 3 +-
gdk/src/cursor.hg | 3 -
gdk/src/device.ccg | 18 +------
gdk/src/device.hg | 34 ++-----------
gdk/src/display.hg | 25 +++++++--
gdk/src/dragcontext.ccg | 5 +-
gdk/src/dragcontext.hg | 6 +-
gdk/src/enums.hg | 1 -
gdk/src/event.ccg | 2 +-
gdk/src/event.hg | 10 ++--
gdk/src/events.ccg | 9 ---
gdk/src/events.hg | 26 +---------
gdk/src/filelist.am | 2 -
gdk/src/monitor.hg | 2 +
gdk/src/screen.ccg | 29 -----------
gdk/src/screen.hg | 79 -----------------------------
gdk/src/visual.ccg | 27 ----------
gdk/src/visual.hg | 68 -------------------------
gdk/src/window.hg | 5 +--
gtk/src/icontheme.hg | 6 +-
gtk/src/invisible.hg | 10 ++--
gtk/src/menu.hg | 2 +-
gtk/src/recentmanager.hg | 8 +---
gtk/src/settings.hg | 2 +-
gtk/src/stylecontext.hg | 27 +++++-----
gtk/src/widget.ccg | 23 --------
gtk/src/widget.hg | 31 +-----------
gtk/src/window.ccg | 2 +-
gtk/src/window.hg | 9 +--
tools/extra_defs_gen/generate_defs_gdk.cc | 2 -
tools/m4/convert_gdk.m4 | 16 +------
35 files changed, 89 insertions(+), 439 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d078aa1..507b6a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -90,16 +90,12 @@ gdk/gdkmm/rectangle.cc
gdk/gdkmm/rectangle.h
gdk/gdkmm/rgba.cc
gdk/gdkmm/rgba.h
-gdk/gdkmm/screen.cc
-gdk/gdkmm/screen.h
gdk/gdkmm/seat.cc
gdk/gdkmm/seat.h
gdk/gdkmm/timecoord.cc
gdk/gdkmm/timecoord.h
gdk/gdkmm/types.cc
gdk/gdkmm/types.h
-gdk/gdkmm/visual.cc
-gdk/gdkmm/visual.h
gdk/gdkmm/window.cc
gdk/gdkmm/window.h
gdk/gdkmm/wrap_init.cc
diff --git a/demos/gtk-demo/example_change_display.cc b/demos/gtk-demo/example_change_display.cc
index 18edcc4..60fb3f6 100644
--- a/demos/gtk-demo/example_change_display.cc
+++ b/demos/gtk-demo/example_change_display.cc
@@ -32,7 +32,7 @@
class Popup : public Gtk::Window
{
public:
- Popup(const Glib::RefPtr<Gdk::Screen>& screen, const Glib::ustring& prompt);
+ Popup(const Glib::RefPtr<Gdk::Display>& display, const Glib::ustring& prompt);
~Popup() override;
protected:
@@ -52,7 +52,7 @@ protected:
virtual void initialize_displays();
virtual void query_change_display();
virtual Gtk::Widget* find_toplevel_at_pointer(const Glib::RefPtr<Gdk::Display>& display);
- virtual Gtk::Window* query_for_toplevel(const Glib::RefPtr<Gdk::Screen>& screen, const Glib::ustring&
prompt);
+ virtual Gtk::Window* query_for_toplevel(const Glib::RefPtr<Gdk::Display>& display, const Glib::ustring&
prompt);
//signal handlers:
virtual void on_button_display_open();
@@ -263,15 +263,15 @@ void Example_ChangeDisplay::on_treeview_display_selection_changed()
*/
void Example_ChangeDisplay::query_change_display()
{
- auto refScreen = get_screen();
- auto pTopLevel = query_for_toplevel(refScreen,
+ auto refDisplay = get_display();
+ auto pTopLevel = query_for_toplevel(refDisplay,
"Please select the toplevel\n"
- "to move to the new screen");
+ "to move to the new display");
if (pTopLevel)
- pTopLevel->set_screen( m_refCurrentDisplay->get_default_screen() );
+ pTopLevel->set_display(m_refCurrentDisplay);
else
- refScreen->get_display()->beep();
+ refDisplay->beep();
}
@@ -289,21 +289,19 @@ void Example_ChangeDisplay::on_response(int response_id)
* the mouse. When the mouse is released, returns the toplevel
* window under the pointer, or NULL, if there is none.
*/
-Gtk::Window* Example_ChangeDisplay::query_for_toplevel(const Glib::RefPtr<Gdk::Screen>& screen, const
Glib::ustring& prompt)
+Gtk::Window* Example_ChangeDisplay::query_for_toplevel(const Glib::RefPtr<Gdk::Display>& display, const
Glib::ustring& prompt)
{
- auto refDisplay = screen->get_display();
-
if(m_pPopup)
{
delete m_pPopup;
m_pPopup = nullptr;
}
- m_pPopup = new Popup(screen, prompt);
+ m_pPopup = new Popup(display, prompt);
m_pPopup->show();
- auto cursor = Gdk::Cursor::create(refDisplay, Gdk::Cursor::Type::CROSSHAIR);
+ auto cursor = Gdk::Cursor::create(display, "crosshair");
Gtk::Window* toplevel = nullptr;
@@ -323,7 +321,7 @@ Gtk::Window* Example_ChangeDisplay::query_for_toplevel(const Glib::RefPtr<Gdk::S
while (!m_popup_clicked)
Gtk::Main::iteration(true);
- toplevel = dynamic_cast<Gtk::Window*>(find_toplevel_at_pointer(screen->get_display()));
+ toplevel = dynamic_cast<Gtk::Window*>(find_toplevel_at_pointer(display));
if (toplevel == m_pPopup)
toplevel = nullptr;
}
@@ -366,11 +364,11 @@ bool Example_ChangeDisplay::on_popup_button_release_event(Gdk::EventButton& /* e
return true;
}
-Popup::Popup(const Glib::RefPtr<Gdk::Screen>& screen, const Glib::ustring& prompt)
+Popup::Popup(const Glib::RefPtr<Gdk::Display>& display, const Glib::ustring& prompt)
: Gtk::Window(Gtk::WindowType::POPUP),
m_Label(prompt)
{
- set_screen(screen);
+ set_display(display);
set_modal(true);
set_position(Gtk::WindowPosition::CENTER);
diff --git a/gdk/gdkmm.h b/gdk/gdkmm.h
index a706483..aae54d3 100644
--- a/gdk/gdkmm.h
+++ b/gdk/gdkmm.h
@@ -22,7 +22,6 @@
#define _GDKMM_GDKMM_H_
#include <gdkmm/types.h>
-#include <gdkmm/visual.h>
#include <gdkmm/window.h>
#include <gdkmm/pixbuf.h>
#include <gdkmm/pixbufanimation.h>
@@ -37,7 +36,6 @@
#include <gdkmm/display.h>
#include <gdkmm/displaymanager.h>
#include <gdkmm/devicemanager.h>
-#include <gdkmm/screen.h>
#include <gdkmm/seat.h>
#include <gdkmm/monitor.h>
#include <gdkmm/general.h>
diff --git a/gdk/src/applaunchcontext.ccg b/gdk/src/applaunchcontext.ccg
index e745a23..3022572 100644
--- a/gdk/src/applaunchcontext.ccg
+++ b/gdk/src/applaunchcontext.ccg
@@ -15,6 +15,8 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <gdk/gdk.h>
+
namespace Gdk
{
diff --git a/gdk/src/applaunchcontext.hg b/gdk/src/applaunchcontext.hg
index bb59977..8ec6e37 100644
--- a/gdk/src/applaunchcontext.hg
+++ b/gdk/src/applaunchcontext.hg
@@ -16,13 +16,13 @@
*/
#include <giomm/appinfo.h>
-#include <gdkmm/screen.h>
_DEFS(gdkmm,gdk)
_PINCLUDE(giomm/private/applaunchcontext_p.h)
namespace Gdk
{
+class Display;
/** This is an implementation of Gio::AppLaunchContext that
* handles launching an application in a graphical context. It provides
@@ -41,7 +41,6 @@ protected:
public:
_WRAP_CREATE()
- _WRAP_METHOD(void set_screen(const Glib::RefPtr<Gdk::Screen>& screen), gdk_app_launch_context_set_screen)
_WRAP_METHOD(void set_desktop(int desktop), gdk_app_launch_context_set_desktop)
_WRAP_METHOD(void set_timestamp(guint32 timestamp), gdk_app_launch_context_set_timestamp)
_WRAP_METHOD(void set_icon(const Glib::RefPtr<Gio::Icon>& icon), gdk_app_launch_context_set_icon)
diff --git a/gdk/src/cursor.hg b/gdk/src/cursor.hg
index e16e22c..df1dd06 100644
--- a/gdk/src/cursor.hg
+++ b/gdk/src/cursor.hg
@@ -45,7 +45,6 @@ public:
//but constructors assume that they own the instance.
//And we would have to have to use the gdk_cursor_new_*() functions in the constructors anyway,
//because they do more than just call g_object_new().
- _WRAP_METHOD(static Glib::RefPtr<Cursor> create(const Glib::RefPtr<Display>& display, Type cursor_type),
gdk_cursor_new_for_display)
_WRAP_METHOD(static Glib::RefPtr<Cursor> create(const Glib::RefPtr<Display>& display, const
Glib::RefPtr<Pixbuf>& pixbuf, int x, int y), gdk_cursor_new_from_pixbuf)
_WRAP_METHOD(static Glib::RefPtr<Cursor> create(const Glib::RefPtr<Display>& display, const
::Cairo::RefPtr< ::Cairo::Surface>& surface, double x, double y), gdk_cursor_new_from_surface)
@@ -60,8 +59,6 @@ public:
// gdk_cursor_get_surface() returns a pointer to a newly created cairo_surface_t, or NULL.
_WRAP_METHOD(::Cairo::RefPtr< ::Cairo::Surface> get_surface(double& x_hot, double& y_hot) const,
gdk_cursor_get_surface)
-
- _WRAP_METHOD(Type get_cursor_type() const, gdk_cursor_get_cursor_type)
};
} //namespace Gdk
diff --git a/gdk/src/device.ccg b/gdk/src/device.ccg
index e9c17c0..63fd6b9 100644
--- a/gdk/src/device.ccg
+++ b/gdk/src/device.ccg
@@ -39,26 +39,12 @@ std::vector<TimeCoord> Device::get_history(const Glib::RefPtr<Window>& window, g
void Device::get_position(int& x, int& y) const
{
- gdk_device_get_position(const_cast<GdkDevice*>(gobj()), nullptr, &x, &y);
-}
-
-void Device::get_position(Glib::RefPtr<Screen>& screen, int& x, int& y) const
-{
- GdkScreen* cScreen = nullptr;
- gdk_device_get_position(const_cast<GdkDevice*>(gobj()), &cScreen, &x, &y);
- screen = Glib::wrap(cScreen, true);
+ gdk_device_get_position(const_cast<GdkDevice*>(gobj()), &x, &y);
}
void Device::get_position(double& x, double& y) const
{
- gdk_device_get_position_double(const_cast<GdkDevice*>(gobj()), nullptr, &x, &y);
-}
-
-void Device::get_position(Glib::RefPtr<Screen>& screen, double& x, double& y) const
-{
- GdkScreen* cScreen = nullptr;
- gdk_device_get_position_double(const_cast<GdkDevice*>(gobj()), &cScreen, &x, &y);
- screen = Glib::wrap(cScreen, true);
+ gdk_device_get_position_double(const_cast<GdkDevice*>(gobj()), &x, &y);
}
Glib::RefPtr<Window> Device::get_window_at_position()
diff --git a/gdk/src/device.hg b/gdk/src/device.hg
index b6882b3..a4dabfd 100644
--- a/gdk/src/device.hg
+++ b/gdk/src/device.hg
@@ -107,28 +107,17 @@ public:
_IGNORE(gdk_device_grab, gdk_device_ungrab)dnl//deprecated
- _WRAP_METHOD(void warp(const Glib::RefPtr<Screen>& screen, int x, int y), gdk_device_warp)
+ _WRAP_METHOD(void warp(int x, int y), gdk_device_warp)
/** Gets the current location of the device.
* 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().
*
- * @param x This will contain the root window X coordinate of the device.
- * @param y This will contain the root window X coordinate of the device.
+ * @param[out] x This will contain the root window X coordinate of the device.
+ * @param[out] y This will contain the root window X coordinate of the device.
*/
void get_position(int& x, int& y) const;
-
- /** Gets the current location of device.
- * 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().
- *
- * @param screen This will contain the screen that the device is on.
- * @param x This will contain the root window X coordinate of the device.
- * @param y This will contain the root window X coordinate of the device.
- */
- void get_position(Glib::RefPtr<Screen>& screen, int& x, int& y) const;
_IGNORE(gdk_device_get_position)
@@ -137,25 +126,12 @@ public:
* this function may not be called on devices of type Gdk::Device::Type::SLAVE,
* unless there is an ongoing grab on them. See grab().
*
- * @param x This will contain the root window X coordinate of the device.
- * @param y This will contain the root window X coordinate of the device.
+ * @param[out] x This will contain the root window X coordinate of the device.
+ * @param[out] y This will contain the root window X coordinate of the device.
*
* @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,
- * unless there is an ongoing grab on them. See grab().
- *
- * @param screen This will contain the screen that the device is on.
- * @param x This will contain the root window X coordinate of the device.
- * @param y This will contain the root window X coordinate of the device.
- *
- * @newin{3,10}
- */
- void get_position(Glib::RefPtr<Screen>& screen, double& x, double& y) const;
_IGNORE(gdk_device_get_position_double)
_WRAP_METHOD(Glib::RefPtr<Window> get_window_at_position(int& win_x, int& win_y),
gdk_device_get_window_at_position, refreturn)
diff --git a/gdk/src/display.hg b/gdk/src/display.hg
index eebd776..ad80162 100644
--- a/gdk/src/display.hg
+++ b/gdk/src/display.hg
@@ -18,7 +18,6 @@
#include <vector>
-#include <gdkmm/screen.h>
#include <gdkmm/applaunchcontext.h>
#include <gdkmm/types.h> //For ModifierType
#include <gdkmm/event.h>
@@ -39,11 +38,11 @@ class Window;
/** Gdk::Display object's purpose is two fold:
* To grab/ungrab keyboard focus and mouse pointer
- * To manage and provide information about the Gdk::Screen(s) available for this Gdk::Display
+ * To manage and provide information about the Gdk::Monitor(s) available for this Gdk::Display
*
* Gdk::Display objects are the GDK representation of the X Display which can be described as a workstation
consisting
* of a keyboard a pointing device (such as a mouse) and one or more screens. It is used to open and keep
track of
- * various Gdk::Screen objects currently instantiated by the application. It is also used to grab and
release the keyboard
+ * various Gdk::Monitor objects currently instantiated by the application. It is also used to grab and
release the keyboard
* and the mouse pointer.
*/
class Display : public Glib::Object
@@ -57,9 +56,6 @@ public:
_WRAP_METHOD(Glib::ustring get_name() const, gdk_display_get_name)
- _WRAP_METHOD(Glib::RefPtr<Screen> get_default_screen(), gdk_display_get_default_screen, refreturn)
- _WRAP_METHOD(Glib::RefPtr<const Screen> get_default_screen() const, gdk_display_get_default_screen,
refreturn, constversion)
-
_WRAP_METHOD(bool device_is_grabbed(const Glib::RefPtr<const Gdk::Device>& device) const,
gdk_display_device_is_grabbed)
_WRAP_METHOD(void beep(), gdk_display_beep)
_WRAP_METHOD(void sync(), gdk_display_sync)
@@ -156,6 +152,10 @@ public:
_WRAP_METHOD(Glib::RefPtr<Monitor> get_monitor_at_window(const Glib::RefPtr<Window>& window),
gdk_display_get_monitor_at_window, refreturn)
_WRAP_METHOD(Glib::RefPtr<const Monitor> get_monitor_at_window(const Glib::RefPtr<Window>& window) const,
gdk_display_get_monitor_at_window, refreturn, constversion)
+ template <class ValueType>
+ bool get_setting(const Glib::ustring& name, ValueType& value) const;
+ _IGNORE(gdk_display_get_setting)
+
//We use no_default_handler because GdkDisplayClass is private.
_WRAP_SIGNAL(void closed(bool is_error), closed, no_default_handler)
@@ -175,4 +175,17 @@ public:
// We don't wrap the vfuncs because GdkDisplayClass is private.
};
+template <class ValueType>
+bool Display::get_setting(const Glib::ustring& name, ValueType& value) const
+{
+ Glib::Value<ValueType> glibmmvalue;
+ glibmmvalue.init(Glib::Value<ValueType>::value_type());
+
+ gboolean result = gdk_display_get_setting(const_cast<GdkDisplay*>(gobj()), name.c_str(),
glibmmvalue.gobj());
+
+ value = glibmmvalue.get();
+ return result;
+}
+
+
} // namespace Gdk
diff --git a/gdk/src/dragcontext.ccg b/gdk/src/dragcontext.ccg
index 017a193..0d8866c 100644
--- a/gdk/src/dragcontext.ccg
+++ b/gdk/src/dragcontext.ccg
@@ -26,11 +26,12 @@
namespace Gdk
{
-void DragContext::find_window_for_screen(const Glib::RefPtr<Window>& drag_window, const
Glib::RefPtr<Screen>& screen, int x_root, int y_root, Glib::RefPtr<Window>& dest_window, DragProtocol&
protocol) const
+void DragContext::find_window(const Glib::RefPtr<Window>& drag_window,
+ int x_root, int y_root, Glib::RefPtr<Window>& dest_window, DragProtocol& protocol) const
{
GdkWindow* cWindow = nullptr;
GdkDragProtocol cprotocol = GDK_DRAG_PROTO_NONE; //arbitrary default.
- gdk_drag_find_window_for_screen(const_cast<GdkDragContext*>(gobj()), drag_window->gobj(), screen->gobj(),
x_root, y_root, &cWindow, &cprotocol);
+ gdk_drag_find_window(const_cast<GdkDragContext*>(gobj()), drag_window->gobj(), x_root, y_root, &cWindow,
&cprotocol);
dest_window = Glib::wrap(cWindow);
protocol = (DragProtocol)cprotocol;
}
diff --git a/gdk/src/dragcontext.hg b/gdk/src/dragcontext.hg
index 35d2057..c757c30 100644
--- a/gdk/src/dragcontext.hg
+++ b/gdk/src/dragcontext.hg
@@ -94,9 +94,9 @@ public:
_WRAP_METHOD(DragAction get_suggested_action() const, gdk_drag_context_get_suggested_action)
_WRAP_METHOD(DragAction get_selected_action() const, gdk_drag_context_get_selected_action)
- _WRAP_METHOD_DOCS_ONLY(gdk_drag_find_window_for_screen)
- void find_window_for_screen(const Glib::RefPtr<Window>& drag_window, const Glib::RefPtr<Screen>& screen,
int x_root, int y_root, Glib::RefPtr<Window>& dest_window, DragProtocol& protocol) const;
- _IGNORE(gdk_drag_find_window_for_screen)
+ _WRAP_METHOD_DOCS_ONLY(gdk_drag_find_window)
+ void find_window(const Glib::RefPtr<Window>& drag_window, int x_root, int y_root, Glib::RefPtr<Window>&
dest_window, DragProtocol& protocol) const;
+ _IGNORE(gdk_drag_find_window)
};
} // namespace Gdk
diff --git a/gdk/src/enums.hg b/gdk/src/enums.hg
index d99d153..3a489b4 100644
--- a/gdk/src/enums.hg
+++ b/gdk/src/enums.hg
@@ -40,7 +40,6 @@ _WRAP_ENUM(NotifyType, GdkNotifyType)
_WRAP_ENUM(OwnerChange, GdkOwnerChange)
_WRAP_ENUM(PropertyState, GdkPropertyState)
_WRAP_ENUM(ScrollDirection, GdkScrollDirection)
-_WRAP_ENUM(SettingAction, GdkSettingAction)
// GdkEventVisibility is deprecated and not wrapped in gtkmm.
//_WRAP_ENUM(VisibilityState, GdkVisibilityState)
_WRAP_ENUM(TouchpadGesturePhase, GdkTouchpadGesturePhase)
diff --git a/gdk/src/event.ccg b/gdk/src/event.ccg
index 55fbd85..0ebaee1 100644
--- a/gdk/src/event.ccg
+++ b/gdk/src/event.ccg
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <gdkmm/screen.h>
+#include <gdkmm/display.h>
#include <gdkmm/seat.h>
#include <gdkmm/window.h>
diff --git a/gdk/src/event.hg b/gdk/src/event.hg
index 5a1fcf1..8d76ae5 100644
--- a/gdk/src/event.hg
+++ b/gdk/src/event.hg
@@ -38,7 +38,7 @@ extern "C" { typedef union _GdkEvent GdkEvent; }
namespace Gdk
{
-class Screen;
+class Display;
class Seat;
class Window;
@@ -78,9 +78,9 @@ public:
_WRAP_METHOD(static void set_show_events(bool show_events = true), gdk_set_show_events)
_WRAP_METHOD(static bool get_show_events(), gdk_get_show_events)
- _IGNORE(gdk_event_set_screen) //deprecated
- _WRAP_METHOD(Glib::RefPtr<Screen> get_screen(), gdk_event_get_screen, refreturn)
- _WRAP_METHOD(Glib::RefPtr<const Screen> get_screen() const, gdk_event_get_screen, refreturn, constversion)
+ _WRAP_METHOD(void set_display(const Glib::RefPtr<Display>& display), gdk_event_set_display)
+ _WRAP_METHOD(Glib::RefPtr<Display> get_display(), gdk_event_get_display, refreturn)
+ _WRAP_METHOD(Glib::RefPtr<const Display> get_display() const, gdk_event_get_display, refreturn,
constversion)
_WRAP_METHOD(Glib::RefPtr<Seat> get_seat(), gdk_event_get_seat, refreturn, newin "3,90")
_WRAP_METHOD(Glib::RefPtr<const Seat> get_seat() const, gdk_event_get_seat, refreturn, constversion, newin
"3,90")
@@ -104,7 +104,7 @@ public:
gdk_event_get_pointer_emulated, gdk_event_get_crossing_mode,
gdk_event_get_crossing_detail, gdk_event_get_focus_in, gdk_event_get_property,
gdk_event_get_selection, gdk_event_get_selection_property,
- gdk_event_get_drag_context, gdk_event_get_window_state, gdk_event_get_setting,
+ gdk_event_get_drag_context, gdk_event_get_window_state,
gdk_event_get_grab_window, gdk_event_get_touchpad_gesture_phase,
gdk_event_get_touchpad_gesture_n_fingers, gdk_event_get_touchpad_deltas,
gdk_event_get_touchpad_angle_delta, gdk_event_get_touchpad_scale,
diff --git a/gdk/src/events.ccg b/gdk/src/events.ccg
index b14d152..f2908b7 100644
--- a/gdk/src/events.ccg
+++ b/gdk/src/events.ccg
@@ -435,15 +435,6 @@ void EventWindowState::get_window_state(Gdk::Window::State& changed,
new_state = static_cast<Gdk::Window::State>(c_new_state);
}
-// *** EventSetting ***
-
-Glib::ustring EventSetting::get_setting() const
-{
- const char* setting = nullptr;
- gdk_event_get_setting(Event::gobj(), &setting);
- return Glib::convert_const_gchar_ptr_to_ustring(setting);
-}
-
// *** EventGrabBroken ***
Glib::RefPtr<Gdk::Window> EventGrabBroken::get_grab_window()
diff --git a/gdk/src/events.hg b/gdk/src/events.hg
index 0c0cbc9..851bb99 100644
--- a/gdk/src/events.hg
+++ b/gdk/src/events.hg
@@ -104,7 +104,7 @@ public:
// Belong to the base class:
_IGNORE(gdk_event_get_event_type, gdk_event_get_window, gdk_event_is_sent,
- gdk_event_get_screen, gdk_event_get_seat, gdk_event_get, gdk_event_peek,
+ gdk_event_get_seat, gdk_event_get, gdk_event_peek,
gdk_event_put, gdk_events_pending, gdk_event_get_device_tool,
gdk_event_set_device_tool)
};
@@ -692,30 +692,6 @@ public:
_IGNORE(gdk_event_get_window_state)
};
-/** Generated when a setting is modified.
- *
- * get_event_type() will return Gdk::Event::Type::SETTING.
- *
- * @newin{3,90}
- */
-class EventSetting : public Event
-{
- _CLASS_GDKEVENT(EventSetting, GdkEventSetting, Event, GdkEvent)
-
-public:
-
- /*
- * Specifies what happened to the setting.
- */
- //Gdk::SettingAction get_setting_action() const; //TODO Remove? There is no corresponding gtk+ function.
-
- /**
- * Returns the name of the setting.
- */
- Glib::ustring get_setting() const;
- _IGNORE(gdk_event_get_setting)
-};
-
/** Generated when a pointer or keyboard grab is broken. On X11, this happens
* when the grab window becomes unviewable (i.e. it or one of its ancestors is
* unmapped), or if the same application grabs the pointer or keyboard again.
diff --git a/gdk/src/filelist.am b/gdk/src/filelist.am
index 13777aa..1f80fb8 100644
--- a/gdk/src/filelist.am
+++ b/gdk/src/filelist.am
@@ -34,11 +34,9 @@ gdkmm_files_any_hg = \
pixbufloader.hg \
rectangle.hg \
rgba.hg \
- screen.hg \
seat.hg \
timecoord.hg \
types.hg \
- visual.hg \
window.hg
gdkmm_files_deprecated_hg =
diff --git a/gdk/src/monitor.hg b/gdk/src/monitor.hg
index 953273f..0165660 100644
--- a/gdk/src/monitor.hg
+++ b/gdk/src/monitor.hg
@@ -59,6 +59,7 @@ public:
_WRAP_METHOD(int get_refresh_rate() const, gdk_monitor_get_refresh_rate)
_WRAP_METHOD(SubpixelLayout get_subpixel_layout() const, gdk_monitor_get_subpixel_layout)
_WRAP_METHOD(bool is_primary() const, gdk_monitor_is_primary)
+ _WRAP_METHOD(bool is_valid() const, gdk_monitor_is_valid)
//TODO: Wrap or ignore GdkMonitor::invalidate. It's not documented.
// I don't know if it's meant to be used outside gtk+. /Kjell
@@ -76,6 +77,7 @@ public:
_WRAP_PROPERTY("height-mm", int)
_WRAP_PROPERTY("refresh-rate", int)
_WRAP_PROPERTY("subpixel-layout", SubpixelLayout)
+ _WRAP_PROPERTY("valid", bool)
};
} // namespace Gdk
diff --git a/gdk/src/window.hg b/gdk/src/window.hg
index f8f8f1a..bebd9f2 100644
--- a/gdk/src/window.hg
+++ b/gdk/src/window.hg
@@ -24,7 +24,7 @@ _CONFIGINCLUDE(gdkmmconfig.h)
#include <cairomm/pattern.h>
#include <gdkmm/device.h>
#include <gdkmm/event.h>
-#include <gdkmm/visual.h>
+#include <gdkmm/rectangle.h>
#include <gdkmm/rgba.h>
#include <cairomm/context.h>
#include <gdk/gdk.h>
@@ -81,9 +81,6 @@ public:
_WRAP_METHOD(Type get_window_type() const, gdk_window_get_window_type)
- _WRAP_METHOD(Glib::RefPtr<Screen> get_screen(), gdk_window_get_screen, refreturn)
- _WRAP_METHOD(Glib::RefPtr<const Screen> get_screen() const, gdk_window_get_screen, refreturn, constversion)
-
_WRAP_METHOD(Glib::RefPtr<Display> get_display(), gdk_window_get_display, refreturn)
_WRAP_METHOD(Glib::RefPtr<const Display> get_display() const, gdk_window_get_display, refreturn,
constversion)
diff --git a/gtk/src/icontheme.hg b/gtk/src/icontheme.hg
index f392d72..314e82f 100644
--- a/gtk/src/icontheme.hg
+++ b/gtk/src/icontheme.hg
@@ -18,7 +18,7 @@
#include <vector>
#include <gdkmm/pixbuf.h>
-#include <gdkmm/screen.h>
+#include <gdkmm/display.h>
#include <gtkmm/iconinfo.h>
#include <giomm/icon.h>
@@ -46,8 +46,8 @@ public:
_WRAP_CREATE()
_WRAP_METHOD(static Glib::RefPtr<IconTheme> get_default(), gtk_icon_theme_get_default, refreturn)
- _WRAP_METHOD(static Glib::RefPtr<IconTheme> get_for_screen(const Glib::RefPtr<Gdk::Screen>& screen),
gtk_icon_theme_get_for_screen, refreturn)
- _WRAP_METHOD(void set_screen(const Glib::RefPtr<Gdk::Screen>& screen), gtk_icon_theme_set_screen)
+ _WRAP_METHOD(static Glib::RefPtr<IconTheme> get_for_display(const Glib::RefPtr<Gdk::Display>& display),
gtk_icon_theme_get_for_display, refreturn)
+ _WRAP_METHOD(void set_display(const Glib::RefPtr<Gdk::Display>& display), gtk_icon_theme_set_display)
void set_search_path(const std::vector<Glib::ustring>& path);
std::vector<Glib::ustring> get_search_path() const;
_WRAP_METHOD(void append_search_path(const Glib::ustring& path), gtk_icon_theme_append_search_path)
diff --git a/gtk/src/invisible.hg b/gtk/src/invisible.hg
index afdfd72..7f7b823 100644
--- a/gtk/src/invisible.hg
+++ b/gtk/src/invisible.hg
@@ -33,13 +33,13 @@ class Invisible : public Widget
_CLASS_GTKOBJECT(Invisible, GtkInvisible, GTK_INVISIBLE, Gtk::Widget, GtkWidget)
public:
_CTOR_DEFAULT
- _WRAP_CTOR(Invisible(const Glib::RefPtr<Gdk::Screen>& screen), gtk_invisible_new_for_screen)
+ _WRAP_CTOR(Invisible(const Glib::RefPtr<Gdk::Display>& display), gtk_invisible_new_for_display)
- _WRAP_METHOD(Glib::RefPtr<Gdk::Screen> get_screen(), gtk_invisible_get_screen, refreturn)
- _WRAP_METHOD(Glib::RefPtr<const Gdk::Screen> get_screen() const, gtk_invisible_get_screen, refreturn,
constversion)
- _WRAP_METHOD(void set_screen(const Glib::RefPtr<Gdk::Screen>& screen), gtk_invisible_set_screen)
+ _WRAP_METHOD(Glib::RefPtr<Gdk::Display> get_display(), gtk_invisible_get_display, refreturn)
+ _WRAP_METHOD(Glib::RefPtr<const Gdk::Display> get_display() const, gtk_invisible_get_display, refreturn,
constversion)
+ _WRAP_METHOD(void set_display(const Glib::RefPtr<Gdk::Display>& display), gtk_invisible_set_display)
- _WRAP_PROPERTY("screen", Glib::RefPtr<Gdk::Screen>)
+ _WRAP_PROPERTY("display", Glib::RefPtr<Gdk::Display>)
};
} //namespace Gtk
diff --git a/gtk/src/menu.hg b/gtk/src/menu.hg
index 12885a5..603d205 100644
--- a/gtk/src/menu.hg
+++ b/gtk/src/menu.hg
@@ -124,7 +124,7 @@ public:
_WRAP_METHOD(Widget* get_attach_widget(), gtk_menu_get_attach_widget)
_WRAP_METHOD(const Widget* get_attach_widget() const, gtk_menu_get_attach_widget, constversion)
- _WRAP_METHOD(void set_screen(const Glib::RefPtr<Gdk::Screen>& screen), gtk_menu_set_screen)
+ _WRAP_METHOD(void set_display(const Glib::RefPtr<Gdk::Display>& display), gtk_menu_set_display)
_WRAP_METHOD(void attach(Gtk::Widget& child, guint left_attach, guint right_attach, guint top_attach,
guint bottom_attach), gtk_menu_attach)
diff --git a/gtk/src/recentmanager.hg b/gtk/src/recentmanager.hg
index b4232f6..30c774a 100644
--- a/gtk/src/recentmanager.hg
+++ b/gtk/src/recentmanager.hg
@@ -19,7 +19,6 @@ _CONFIGINCLUDE(gtkmmconfig.h)
#include <vector>
-#include <gdkmm/screen.h>
#include <gdkmm/pixbuf.h>
#include <gtkmm/recentinfo.h>
@@ -50,12 +49,7 @@ _WRAP_GERROR(RecentManagerError, GtkRecentManagerError, GTK_RECENT_MANAGER_ERROR
*
* The RecentManager acts like a database of all the recently
* used files. You can create new RecentManager objects, but
- * it is more efficient to use the standard recent manager for
- * the Gdk::Screen so that informations about the recently used
- * files is shared with other people using them. Normally, you
- * retrieve the recent manager for a particular screen using
- * get_for_screen() and it will contain information about current
- * recent manager for that screen.
+ * it is more efficient to use the default manager created by GTK+.
*
* @newin{2,10}
*
diff --git a/gtk/src/settings.hg b/gtk/src/settings.hg
index 50b5e84..e0ad570 100644
--- a/gtk/src/settings.hg
+++ b/gtk/src/settings.hg
@@ -40,7 +40,7 @@ public:
_WRAP_METHOD(static Glib::RefPtr<Settings> get_default(), gtk_settings_get_default, refreturn)
- _WRAP_METHOD(static Glib::RefPtr<Settings> get_for_screen(const Glib::RefPtr<Gdk::Screen>& screen),
gtk_settings_get_for_screen, refreturn)
+ _WRAP_METHOD(static Glib::RefPtr<Settings> get_for_display(const Glib::RefPtr<Gdk::Display>& display),
gtk_settings_get_for_display, refreturn)
_WRAP_METHOD(void reset_property(const Glib::ustring& name), gtk_settings_reset_property)
diff --git a/gtk/src/stylecontext.hg b/gtk/src/stylecontext.hg
index 8cf3b56..955db1d 100644
--- a/gtk/src/stylecontext.hg
+++ b/gtk/src/stylecontext.hg
@@ -23,7 +23,7 @@ _PINCLUDE(gtk/gtk.h)
#include <gtkmm/border.h>
#include <gtkmm/enums.h>
#include <gdkmm/window.h>
-#include <gdkmm/screen.h>
+#include <gdkmm/display.h>
#include <gtkmm/enums.h>
#include <gtkmm/widgetpath.h>
@@ -42,18 +42,18 @@ namespace Gtk
* In order to construct the final style information, StyleContext
* queries information from all attached StyleProviders. Style providers
* can be either attached explicitly to the context through
- * add_provider(), or to the screen through
- * add_provider_for_screen(). The resulting style is a
+ * add_provider(), or to the display through
+ * add_provider_for_display(). The resulting style is a
* combination of all providers' information in priority order.
*
* For GTK+ widgets, any StyleContext returned by
* Widget::get_style_context() will already have a WidgetPath, a
- * Gdk::Screen and RTL/LTR information set, The style context will be also
+ * Gdk::Display and RTL/LTR information set, The style context will be also
* updated automatically if any of these settings change on the widget.
*
* If you are using the theming layer standalone, you will need to set a
- * widget path and a screen yourself to the created style context through
- * set_path() and set_screen(), as well
+ * widget path and a display yourself to the created style context through
+ * set_path() and set_display(), as well
* as updating the context yourself using invalidate()
* whenever any of the conditions change, such as a change in the
* Settings::property_gtk_theme_name() setting or a hierarchy change in the rendered
@@ -102,8 +102,8 @@ public:
_WRAP_CREATE()
_IGNORE(gtk_style_context_new)
- _WRAP_METHOD(static void add_provider_for_screen(const Glib::RefPtr<Gdk::Screen>& screen, const
Glib::RefPtr<StyleProvider>& provider, guint priority), gtk_style_context_add_provider_for_screen)
- _WRAP_METHOD(static void remove_provider_for_screen(const Glib::RefPtr<Gdk::Screen>& screen, const
Glib::RefPtr<StyleProvider>& provider), gtk_style_context_remove_provider_for_screen)
+ _WRAP_METHOD(static void add_provider_for_display(const Glib::RefPtr<Gdk::Display>& display, const
Glib::RefPtr<StyleProvider>& provider, guint priority), gtk_style_context_add_provider_for_display)
+ _WRAP_METHOD(static void remove_provider_for_display(const Glib::RefPtr<Gdk::Display>& display, const
Glib::RefPtr<StyleProvider>& provider), gtk_style_context_remove_provider_for_display)
_WRAP_METHOD(void add_provider(const Glib::RefPtr<StyleProvider>& provider, guint priority),
gtk_style_context_add_provider)
@@ -150,10 +150,10 @@ public:
_WRAP_METHOD(void remove_class(const Glib::ustring& class_name), gtk_style_context_remove_class)
_WRAP_METHOD(bool has_class(const Glib::ustring& class_name), gtk_style_context_has_class)
- _WRAP_METHOD(void set_screen(const Glib::RefPtr<Gdk::Screen>& screen), gtk_style_context_set_screen)
+ _WRAP_METHOD(void set_display(const Glib::RefPtr<Gdk::Display>& display), gtk_style_context_set_display)
- _WRAP_METHOD(Glib::RefPtr<Gdk::Screen> get_screen(), gtk_style_context_get_screen, refreturn)
- _WRAP_METHOD(Glib::RefPtr<const Gdk::Screen> get_screen() const, gtk_style_context_get_screen, refreturn,
constversion)
+ _WRAP_METHOD(Glib::RefPtr<Gdk::Display> get_display(), gtk_style_context_get_display, refreturn)
+ _WRAP_METHOD(Glib::RefPtr<const Gdk::Display> get_display() const, gtk_style_context_get_display,
refreturn, constversion)
_WRAP_METHOD(bool lookup_color(const Glib::ustring& color_name, Gdk::RGBA& color),
gtk_style_context_lookup_color)
@@ -185,7 +185,7 @@ public:
Border get_margin() const;
_IGNORE(gtk_style_context_get_margin)
- //TODO: _WRAP_METHOD(void reset_widgets(const Glib::RefPtr<Gdk::Screen>& screen),
gtk_style_context_reset_widgets)
+ //TODO: _WRAP_METHOD(void reset_widgets(const Glib::RefPtr<Gdk::Display>& display),
gtk_style_context_reset_widgets)
_WRAP_METHOD(void render_check(const Cairo::RefPtr<Cairo::Context>& cr, double x, double y, double width,
double height), gtk_render_check)
_WRAP_METHOD(void render_option(const Cairo::RefPtr<Cairo::Context>& cr, double x, double y, double width,
double height), gtk_render_option)
@@ -204,8 +204,7 @@ public:
_WRAP_METHOD(void render_insertion_cursor(const Cairo::RefPtr<Cairo::Context>& cr, double x, double y,
const Glib::RefPtr<Pango::Layout>& layout, int index, Pango::Direction direction),
gtk_render_insertion_cursor)
_WRAP_SIGNAL(void changed(), "changed")
-
- _WRAP_PROPERTY("screen", Glib::RefPtr<Gdk::Screen>)
+ _WRAP_PROPERTY("display", Glib::RefPtr<Gdk::Display>)
_WRAP_PROPERTY("parent", Glib::RefPtr<StyleContext>)
};
diff --git a/gtk/src/widget.ccg b/gtk/src/widget.ccg
index 3f65caa..1ea4c43 100644
--- a/gtk/src/widget.ccg
+++ b/gtk/src/widget.ccg
@@ -481,29 +481,6 @@ void Widget_Class::hierarchy_changed_callback_custom(GtkWidget* self, GtkWidget*
}
}
-void Widget_Class::parent_set_callback_custom(GtkWidget* self, GtkWidget* p0)
-{
- //GTKMM_LIFECYCLE
- //Don't call wrap() on a GTK+ instance whose gtkmm instance has been deleted - just call the original C
callback.
- bool gtkmm_p0_already_deleted = Glib::_gobject_cppinstance_already_deleted((GObject*)p0);
-
- if(!gtkmm_p0_already_deleted)
- {
- //Call the regular, generated callback:
- Widget_Class::parent_set_callback(self, p0);
- }
- else
- {
- const auto base = static_cast<BaseClassType*>(
- g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The
original underlying C class).
- );
-
- //Call the original underlying C function:
- if(base && base->parent_set)
- (*base->parent_set)(self, p0);
- }
-}
-
void Widget_Class::dispose_vfunc_callback(GObject* self)
{
//Avoid disposal. See also Window_Class::dispose_vfunc_callback().
diff --git a/gtk/src/widget.hg b/gtk/src/widget.hg
index 26b4486..ab6ef22 100644
--- a/gtk/src/widget.hg
+++ b/gtk/src/widget.hg
@@ -34,7 +34,6 @@ _CONFIGINCLUDE(gtkmmconfig.h)
#include <gdkmm/window.h>
#include <gdkmm/dragcontext.h>
#include <gdkmm/pixbuf.h>
-#include <gdkmm/screen.h>
#include <gtkmm/enums.h>
#include <gdkmm/display.h>
#include <gtkmm/targetlist.h>
@@ -294,11 +293,6 @@ public:
_WRAP_METHOD(Widget* get_ancestor(GType widget_type), gtk_widget_get_ancestor)
_WRAP_METHOD(const Widget* get_ancestor(GType widget_type) const, gtk_widget_get_ancestor, constversion)
- _WRAP_METHOD(Glib::RefPtr<Gdk::Screen> get_screen(), gtk_widget_get_screen, refreturn)
- _WRAP_METHOD(Glib::RefPtr<const Gdk::Screen> get_screen() const, gtk_widget_get_screen, refreturn,
constversion)
-
- _WRAP_METHOD(bool has_screen() const, gtk_widget_has_screen)
-
_WRAP_METHOD(int get_scale_factor() const, gtk_widget_get_scale_factor)
_WRAP_METHOD(Glib::RefPtr<Gdk::Display> get_display(), gtk_widget_get_display, refreturn)
@@ -534,18 +528,8 @@ public:
#m4 _CONVERSION(`GdkRectangle*',`Allocation&',`Glib::wrap($3)')
_WRAP_SIGNAL(void size_allocate(const Allocation& allocation, int baseline, Allocation& out_clip),
"size_allocate")
-// Changed signals -- inform widget of internal changes.
-// We rename parent_set => parent_changed
-// and style_set => style_changed
-// to avoid confusion with set_parent and set_style.
-
_WRAP_SIGNAL(void state_flags_changed(Gtk::StateFlags previous_state_flags), "state-flags-changed")
- /// Informs objects that their parent changed.
- //- The widget passed is the former parent, which may be 0 if
- //- there was no parent. (was parent_set in GTK+)
- _WRAP_SIGNAL(void parent_changed(Widget* previous_parent), "parent_set")
-
_WRAP_SIGNAL(void hierarchy_changed(Widget* previous_toplevel), "hierarchy_changed")
_WRAP_SIGNAL(void style_updated(), "style_updated")
@@ -663,8 +647,8 @@ dnl
_WRAP_SIGNAL(bool drag_drop(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, guint time),
"drag_drop")
_WRAP_SIGNAL(void drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, const
SelectionData& selection_data, guint info, guint time), "drag_data_received")
-_CONVERSION(`GdkScreen*',`const Glib::RefPtr<Gdk::Screen>&',`Glib::wrap($3, true)')
- _WRAP_SIGNAL(void screen_changed(const Glib::RefPtr<Gdk::Screen>& previous_screen), "screen_changed")
+_CONVERSION(`GdkDisplay*',`const Glib::RefPtr<Gdk::Display>&',`Glib::wrap($3, true)')
+ _WRAP_SIGNAL(void display_changed(const Glib::RefPtr<Gdk::Display>& previous_display), "display_changed")
//TODO: The signal_id is very C-like here:
//_WRAP_SIGNAL(bool can_activate_accel(guint signal_id), "can_activate_accel")
@@ -788,17 +772,6 @@ dnl
_POP()
#m4end
-#m4begin
-dnl// Hook in custom parent_set callback.
-dnl// It will use the generated callback.
-dnl
- _PUSH(SECTION_PCC_CLASS_INIT_DEFAULT_SIGNAL_HANDLERS)
- klass->parent_set = &parent_set_callback_custom;
- _SECTION(SECTION_PH_DEFAULT_SIGNAL_HANDLERS)
- static void parent_set_callback_custom(GtkWidget* self, GtkWidget* p0);
- _POP()
-#m4end
-
};
} // namespace Gtk
diff --git a/gtk/src/window.ccg b/gtk/src/window.ccg
index 993333b..ac90cb6 100644
--- a/gtk/src/window.ccg
+++ b/gtk/src/window.ccg
@@ -19,7 +19,7 @@
#include <glibmm/vectorutils.h>
#include <gtkmm/accelgroup.h>
-#include <gdkmm/cursor.h>
+#include <gdkmm/monitor.h>
#include <gdkmm/cairoutils.h>
#include <gtk/gtk.h>
diff --git a/gtk/src/window.hg b/gtk/src/window.hg
index cc12161..708d159 100644
--- a/gtk/src/window.hg
+++ b/gtk/src/window.hg
@@ -65,7 +65,7 @@ public:
_WRAP_PROPERTY("icon", Cairo::RefPtr<Cairo::Surface>)
_WRAP_PROPERTY("mnemonics-visible", bool)
_WRAP_PROPERTY("icon-name", Glib::ustring)
- _WRAP_PROPERTY("screen", Glib::RefPtr<Gdk::Screen>)
+ _WRAP_PROPERTY("display", Glib::RefPtr<Gdk::Display>)
_WRAP_PROPERTY("is_active", bool)
_WRAP_PROPERTY("type_hint", Gdk::Window::TypeHint)
_WRAP_PROPERTY("skip_taskbar_hint", bool)
@@ -202,10 +202,7 @@ dnl
_WRAP_METHOD(Gdk::Gravity get_gravity() const, gtk_window_get_gravity)
- _WRAP_METHOD(void set_screen(const Glib::RefPtr<Gdk::Screen>& screen), gtk_window_set_screen)
-
- _WRAP_METHOD(Glib::RefPtr<Gdk::Screen> get_screen(), gtk_window_get_screen, refreturn)
- _WRAP_METHOD(Glib::RefPtr<const Gdk::Screen> get_screen() const, gtk_window_get_screen, refreturn,
constversion)
+ _WRAP_METHOD(void set_display(const Glib::RefPtr<Gdk::Display>& display), gtk_window_set_display)
_WRAP_METHOD(bool is_active() const, gtk_window_is_active)
@@ -283,7 +280,7 @@ dnl
_WRAP_METHOD(void fullscreen(), gtk_window_fullscreen)
_WRAP_METHOD(void unfullscreen(), gtk_window_unfullscreen)
- _WRAP_METHOD(void fullscreen_on_monitor(const Glib::RefPtr<Gdk::Screen>& screen, int monitor),
gtk_window_fullscreen_on_monitor)
+ _WRAP_METHOD(void fullscreen_on_monitor(const Glib::RefPtr<Gdk::Monitor>& monitor),
gtk_window_fullscreen_on_monitor)
_WRAP_METHOD(void close(), gtk_window_close)
_WRAP_METHOD(void begin_resize_drag(Gdk::WindowEdge edge,
diff --git a/tools/extra_defs_gen/generate_defs_gdk.cc b/tools/extra_defs_gen/generate_defs_gdk.cc
index de42eef..b21e34c 100644
--- a/tools/extra_defs_gen/generate_defs_gdk.cc
+++ b/tools/extra_defs_gen/generate_defs_gdk.cc
@@ -50,9 +50,7 @@ int main(int /* argc */, char** /* argv */)
<< get_defs( GDK_TYPE_PIXBUF_ANIMATION )
<< get_defs( GDK_TYPE_PIXBUF_LOADER )
<< get_defs( GDK_TYPE_RGBA )
- << get_defs( GDK_TYPE_SCREEN )
<< get_defs( GDK_TYPE_SEAT )
- << get_defs( GDK_TYPE_VISUAL )
<< get_defs( GDK_TYPE_WINDOW )
<< get_defs( GDK_TYPE_GL_CONTEXT )
;
diff --git a/tools/m4/convert_gdk.m4 b/tools/m4/convert_gdk.m4
index a354bc2..f9d8c10 100644
--- a/tools/m4/convert_gdk.m4
+++ b/tools/m4/convert_gdk.m4
@@ -64,7 +64,6 @@ _CONV_ENUM(Gdk,Status)
_CONV_ENUM(Gdk,SubpixelLayout)
_CONV_ENUM(Gdk,SubwindowMode)
_CONV_ENUM(Gdk,TouchpadGesturePhase)
-_CONV_INCLASS_ENUM(Gdk,Visual,Type)
_CONV_ENUM(Gdk,WindowAttributesType)
_CONV_ENUM(Gdk,WindowEdge)
_CONV_INCLASS_ENUM(Gdk,Window,Hints)
@@ -135,14 +134,11 @@ _CONVERSION(`const Glib::RefPtr<Gdk::PixbufAnimation>&',`GdkPixbufAnimation*',__
_CONVERSION(`const Glib::RefPtr<Gdk::PixbufAnimationIter>&',`GdkPixbufAnimationIter*',__CONVERT_REFPTR_TO_P)
_CONVERSION(`const Glib::RefPtr<Gdk::DragContext>&',`GdkDragContext*',__CONVERT_REFPTR_TO_P)
_CONVERSION(`const Glib::RefPtr<Display>&',`GdkDisplay*',__CONVERT_REFPTR_TO_P)
-_CONVERSION(`const Glib::RefPtr<Screen>&',`GdkScreen*',__CONVERT_REFPTR_TO_P)
_CONVERSION(`const Glib::RefPtr<Gdk::Display>&',`GdkDisplay*',__CONVERT_REFPTR_TO_P)
-_CONVERSION(`const Glib::RefPtr<Gdk::Screen>&',`GdkScreen*',__CONVERT_REFPTR_TO_P)
-_CONVERSION(`const Glib::RefPtr<Screen>&',`GdkScreen*',__CONVERT_REFPTR_TO_P)
_CONVERSION(`const Glib::RefPtr<Gdk::Device>&',`GdkDevice*',__CONVERT_REFPTR_TO_P)
_CONVERSION(`const Glib::RefPtr<Device>&',`GdkDevice*',__CONVERT_REFPTR_TO_P)
_CONVERSION(`const Glib::RefPtr<const Device>&',`GdkDevice*',__CONVERT_CONST_REFPTR_TO_P_SUN(Gdk::Device))
-_CONVERSION(`const Glib::RefPtr<const
Gdk::Screen>&',`GdkScreen*',__CONVERT_CONST_REFPTR_TO_P_SUN(Gdk::Screen))
+_CONVERSION(`const Glib::RefPtr<Gdk::Monitor>&',`GdkMonitor*',__CONVERT_REFPTR_TO_P)
define(`__CFR2P',`const_cast<$`'2>($`'3.gobj())')
_CONVERSION(const Gdk::Rectangle&,GdkRectangle*,__CFR2P)
@@ -158,7 +154,6 @@ _CONVERSION(`GdkRectangle*',`const Gdk::Rectangle*',`&Glib::wrap($3)')
# Special treatment for the Sun Forte compiler
#_CONVERSION(const Glib::RefPtr<const Gdk::Window>&,GdkWindow*,__CONVERT_CONST_REFPTR_TO_P)
-#_CONVERSION(const Glib::RefPtr<const Gdk::Visual>&,GdkVisual*,__CONVERT_CONST_REFPTR_TO_P)
#_CONVERSION(const Glib::RefPtr<const Gdk::Bitmap>&,GdkBitmap*,__CONVERT_CONST_REFPTR_TO_P)
_CONVERSION(`const Glib::RefPtr<const Gdk::Device>&',
`GdkDevice*',__CONVERT_CONST_REFPTR_TO_P_SUN(Gdk::Device))
@@ -166,7 +161,6 @@ _CONVERSION(`const Glib::RefPtr<const Gdk::Window>&', `GdkWindow*',__CONVERT_CON
_CONVERSION(`const Glib::RefPtr<const Window>&', `GdkWindow*',__CONVERT_CONST_REFPTR_TO_P_SUN(Gdk::Window))
_CONVERSION(`const Glib::RefPtr<const Gdk::GLContext>&',
`GdkGLContext*',__CONVERT_CONST_REFPTR_TO_P_SUN(Gdk::GLContext))
_CONVERSION(`const Glib::RefPtr<const GLContext>&',
`GdkGLContext*',__CONVERT_CONST_REFPTR_TO_P_SUN(Gdk::GLContext))
-_CONVERSION(`const Glib::RefPtr<const Gdk::Visual>&',
`GdkVisual*',__CONVERT_CONST_REFPTR_TO_P_SUN(Gdk::Visual))
_CONVERSION(`const Glib::RefPtr<const Gdk::Bitmap>&',
`GdkBitmap*',__CONVERT_CONST_REFPTR_TO_P_SUN(Gdk::Bitmap))
#_CONVERSION(`const Glib::RefPtr<const Gdk::Drawable>&',
`GdkDrawable*',__CONVERT_CONST_REFPTR_TO_P_SUN(Gdk::Drawable))
#_CONVERSION(`const Glib::RefPtr<const Drawable>&', `GdkDrawable*',__CONVERT_CONST_REFPTR_TO_P_SUN(Drawable))
@@ -186,9 +180,6 @@ _CONVERSION(`GdkDrawContext*',`Glib::RefPtr<const DrawContext>', `Glib::wrap($3)
_CONVERSION(`GdkDrawingContext*',`Glib::RefPtr<DrawingContext>', `Glib::wrap($3)')
_CONVERSION(`GdkCursor*',`Glib::RefPtr<Cursor>', `Glib::wrap($3)')
_CONVERSION(`GdkCursor*',`Glib::RefPtr<const Cursor>', `Glib::wrap($3)')
-_CONVERSION(`GdkVisual*',`Glib::RefPtr<Gdk::Visual>', `Glib::wrap($3)')
-_CONVERSION(`GdkVisual*',`Glib::RefPtr<Visual>', `Glib::wrap($3)')
-_CONVERSION(`GdkVisual*',`Glib::RefPtr<const Visual>', `Glib::wrap($3)')
_CONVERSION(`GdkPixbuf*',`Glib::RefPtr<Pixbuf>', `Glib::wrap($3)')
_CONVERSION(`GdkPixbuf*',`Glib::RefPtr<Gdk::Pixbuf>', `Glib::wrap($3)')
_CONVERSION(`GdkPixbuf*',`Glib::RefPtr<const Gdk::Pixbuf>', `Glib::wrap($3)')
@@ -205,11 +196,6 @@ _CONVERSION(`GdkDisplay*',`Glib::RefPtr<const Gdk::Display>', `Glib::wrap($3)')
_CONVERSION(`GdkDisplayManager*',`Glib::RefPtr<DisplayManager>', `Glib::wrap($3)')
_CONVERSION(`GdkDisplayManager*',`Glib::RefPtr<const DisplayManager>', `Glib::wrap($3)')
-_CONVERSION(`GdkScreen*',`Glib::RefPtr<Screen>', `Glib::wrap($3)')
-_CONVERSION(`GdkScreen*',`Glib::RefPtr<const Screen>', `Glib::wrap($3)')
-_CONVERSION(`GdkScreen*',`Glib::RefPtr<Gdk::Screen>', `Glib::wrap($3)')
-_CONVERSION(`GdkScreen*',`Glib::RefPtr<const Gdk::Screen>', `Glib::wrap($3)')
-
_CONVERSION(`GdkDevice*',`Glib::RefPtr<Device>', `Glib::wrap($3)')
_CONVERSION(`GdkDevice*',`Glib::RefPtr<Gdk::Device>', `Glib::wrap($3)')
_CONVERSION(`GdkDevice*',`Glib::RefPtr<const Device>', `Glib::wrap($3)')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
