Added GSocket/wxSocket alias to socket.h to prevent us from using GSocket

[wxWidgets.git] / src / gtk1 / minifram.cpp

diff --git a/src/gtk1/minifram.cpp b/src/gtk1/minifram.cpp
index e4267e0a7fc8875a49f174f8bf5dc43518efcf01..9da9393c89f83f676204cbe20f67b835ff026f4f 100644 (file)
--- a/src/gtk1/minifram.cpp
+++ b/src/gtk1/minifram.cpp
@@ -12,6 +12,9 @@
 #endif
 
 #include "wx/minifram.h"
+
+#if wxUSE_MINIFRAME
+
 #include "wx/dcscreen.h"
 
 #include "gtk/gtk.h"
@@ -160,6 +163,8 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
 
     if (win->m_isDragging) return TRUE;
 
+    gdk_window_raise( win->m_widget->window );
+    
     gdk_pointer_grab( widget->window, FALSE,
                       (GdkEventMask)
                          (GDK_BUTTON_PRESS_MASK |
@@ -209,7 +214,8 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
     gdk_window_get_origin( widget->window, &org_x, &org_y );
     x += org_x - win->m_diffX;
     y += org_y - win->m_diffY;
-    win->InternalSetPosition(x, y);
+    win->m_x = x;
+    win->m_y = y;
     gtk_widget_set_uposition( win->m_widget, x, y );
 
     return TRUE;
@@ -317,3 +323,5 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
 
     return TRUE;
 }
+
+#endif