making things compile and build again ...

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

diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index 9eda58cc16ec22a2441cf136c2dd22b7b088ddd6..e162ba9014642673570ce1733cfb4178049e10e5 100644 (file)
--- a/src/gtk/minifram.cpp
+++ b/src/gtk/minifram.cpp
@@ -58,12 +58,10 @@ static wxColor LightContrastColour(const wxColour& c)
 }
 
 extern "C" {
 }
 
 extern "C" {

-static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxMiniFrame *win )
+static gboolean gtk_window_own_expose_callback(GtkWidget* widget, GdkEventExpose* gdk_event, wxMiniFrame* win)

 {
 {

-    // don't need to install idle handler, its done from "event" signal
-
-    if (!win->m_hasVMT) return;
-    if (gdk_event->count > 0) return;
+    if (!win->m_hasVMT || gdk_event->count > 0)
+        return false;

 
     GtkPizza *pizza = GTK_PIZZA(widget);
 
 
     GtkPizza *pizza = GTK_PIZZA(widget);
 


@@ -78,8 +76,16 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
     int style = win->GetWindowStyle();
 
     wxClientDC dc(win);
     int style = win->GetWindowStyle();
 
     wxClientDC dc(win);

+    
+#if wxUSE_NEW_DC
+    wxImplDC *impl = dc.GetImpl();
+    wxGTKClientImplDC *client_impl = wxDynamicCast( impl, wxGTKClientImplDC );
+    // Hack alert
+    client_impl->m_window = pizza->bin_window;
+#else

     // Hack alert
     dc.m_window = pizza->bin_window;
     // Hack alert
     dc.m_window = pizza->bin_window;

+#endif

 
     if (style & wxRESIZE_BORDER)
     {
 
     if (style & wxRESIZE_BORDER)
     {


@@ -107,6 +113,7 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
         if (style & wxCLOSE_BOX)
             dc.DrawBitmap( win->m_closeButton, win->m_width-19, 2, true );
     }
         if (style & wxCLOSE_BOX)
             dc.DrawBitmap( win->m_closeButton, win->m_width-19, 2, true );
     }

+    return false;

 }
 }
 
 }
 }
 


@@ -117,8 +124,6 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
 extern "C" {
 static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win )
 {
 extern "C" {
 static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win )
 {

-    // don't need to install idle handler, its done from "event" signal
-

     if (!win->m_hasVMT) return FALSE;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
     if (!win->m_hasVMT) return FALSE;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;


@@ -203,8 +208,6 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
 extern "C" {
 static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win )
 {
 extern "C" {
 static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win )
 {

-    // don't need to install idle handler, its done from "event" signal
-

     if (!win->m_hasVMT) return FALSE;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
     if (!win->m_hasVMT) return FALSE;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;


@@ -238,8 +241,6 @@ extern "C" {
 static gboolean
 gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxMiniFrame *win )
 {
 static gboolean
 gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxMiniFrame *win )
 {

-    // don't need to install idle handler, its done from "event" signal
-

     if (!win->m_hasVMT) return FALSE;
     if (g_blockEventsOnDrag) return FALSE;
 
     if (!win->m_hasVMT) return FALSE;
     if (g_blockEventsOnDrag) return FALSE;
 


@@ -257,8 +258,6 @@ extern "C" {
 static gint
 gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxMiniFrame *win )
 {
 static gint
 gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxMiniFrame *win )
 {

-    // don't need to install idle handler, its done from "event" signal
-

     if (!win->m_hasVMT) return FALSE;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
     if (!win->m_hasVMT) return FALSE;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;


@@ -324,8 +323,6 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
       const wxPoint &pos, const wxSize &size,
       long style, const wxString &name )
 {
       const wxPoint &pos, const wxSize &size,
       long style, const wxString &name )
 {

-    style = style | wxCAPTION;
-

     if ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT))
         m_miniTitle = 16;
 
     if ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT))
         m_miniTitle = 16;