Fixes for transient dialogs in win32.

(bzr r3670)

2 files changed, 6 insertions, 7 deletions

diff --git a/src/ui/widget/dock-item.cpp b/src/ui/widget/dock-item.cpp
index 1e232cb4e..97f11f56e 100644
--- a/src/ui/widget/dock-item.cpp
+++ b/src/ui/widget/dock-item.cpp
@@ -222,8 +222,8 @@ DockItem::present()
 void 
 DockItem::get_position(int& x, int& y)
 { 
-    if (_getWindow()) {
-        _getWindow()->get_position(x, y);
+    if (getWindow()) {
+        getWindow()->get_position(x, y);
     } else {
         x = _x;
         y = _y;
@@ -392,7 +392,7 @@ DockItem::_onKeyPress(GdkEventKey *event)
 void
 DockItem::_onStateChanged(State prev_state, State new_state)
 {
-    _window = _getWindow();
+    _window = getWindow();
 
     if (new_state == FLOATING_STATE) {
         _window->signal_hide().connect(sigc::mem_fun(*this, &Inkscape::UI::Widget::DockItem::_onHideWindow));
@@ -411,7 +411,7 @@ DockItem::_onDeleteEvent(GdkEventAny *event)
 
 
 Gtk::Window *
-DockItem::_getWindow()
+DockItem::getWindow()
 {
     g_return_val_if_fail(_gdl_dock_item, 0);
     Gtk::Container *parent = getWidget().get_parent();
diff --git a/src/ui/widget/dock-item.h b/src/ui/widget/dock-item.h
index 55a280767..f4e403e34 100644
--- a/src/ui/widget/dock-item.h
+++ b/src/ui/widget/dock-item.h
@@ -70,6 +70,8 @@ public:
     State getPrevState() const;
     Placement getPlacement() const;
 
+    Gtk::Window *getWindow();   //< gives the parent window, if the dock item has one (i.e. it's floating)
+
     void addButton(Gtk::Button *button, int response_id);
 
     void hide();
@@ -131,9 +133,6 @@ private:
     static gboolean _signal_delete_event_callback(GtkWidget *self, GdkEventAny *event, void *data);
     static void _signal_drag_end_callback(GtkWidget* self, gboolean p0, void* data);
 
-    /** Internal helpers */
-    Gtk::Window *_getWindow();   //< gives the parent window, if the dock item has one (i.e. it's floating)
-
     /** In order to emulate a signal_response signal like the one for Gtk::Dialog we inject a new
      * signal into GdlDockItem. This signal will be emitted when a button in the dock item added
      * through the addButton(..., response_id) method, is clicked.