X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3cbab64109b007fa1d939fe588f5e79f9105b915..3e1924dd5f5744c3e2a8973de9b3e4f372b7fd85:/src/gtk1/minifram.cpp diff --git a/src/gtk1/minifram.cpp b/src/gtk1/minifram.cpp index c60a64cb35..568e6436ad 100644 --- a/src/gtk1/minifram.cpp +++ b/src/gtk1/minifram.cpp @@ -10,15 +10,19 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/minifram.h" - #if wxUSE_MINIFRAME -#include "wx/dcscreen.h" +#include "wx/minifram.h" + +#ifndef WX_PRECOMP + #include "wx/dcscreen.h" +#endif #include "gtk/gtk.h" +#include "wx/dcclient.h" #include "wx/gtk1/win_gtk.h" #include "wx/gtk1/private.h" +#include "wx/gtk1/dcclient.h" #include #include @@ -101,7 +105,7 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g gdk_gc_unref( gc ); // Hack alert - dc.m_window = pizza->bin_window; + wx_static_cast(wxClientDCImpl *, dc.GetImpl())->m_window = pizza->bin_window; dc.SetTextForeground( *wxWHITE ); dc.DrawText( win->GetTitle(), 6, 3 ); } @@ -147,7 +151,7 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU gdk_gc_unref( gc ); // Hack alert - dc.m_window = pizza->bin_window; + wx_static_cast(wxClientDCImpl *, dc.GetImpl())->m_window = pizza->bin_window; dc.SetTextForeground( *wxWHITE ); dc.DrawText( win->GetTitle(), 6, 3 ); } @@ -219,7 +223,7 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto if (!win->m_isDragging) return TRUE; - win->m_isDragging = FALSE; + win->m_isDragging = false; int x = (int)gdk_event->x; int y = (int)gdk_event->y; @@ -400,4 +404,4 @@ void wxMiniFrame::SetTitle( const wxString &title ) gtk_widget_draw( m_mainWidget, (GdkRectangle*) NULL ); } -#endif +#endif // wxUSE_MINIFRAME