no changes, just refactor the code sending spin update event to SendSpinUpdate()...

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

diff --git a/src/gtk1/minifram.cpp b/src/gtk1/minifram.cpp
index 3e4e04231f2d458c11ae5a690515bc22e6a9f7a3..a7803836b3e9ddb6b1ae03a36e7d4c9c40597a7b 100644 (file)
--- a/src/gtk1/minifram.cpp
+++ b/src/gtk1/minifram.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/gtk/minifram.cpp
+// Name:        src/gtk1/minifram.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -10,15 +10,17 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/minifram.h"
-

 #if wxUSE_MINIFRAME
 
 #if wxUSE_MINIFRAME
 

-#include "wx/dcscreen.h"
+#include "wx/minifram.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dcscreen.h"
+#endif

 
 #include "gtk/gtk.h"
 
 #include "gtk/gtk.h"

-#include "wx/gtk/win_gtk.h"
-#include "wx/gtk/private.h"
+#include "wx/gtk1/win_gtk.h"
+#include "wx/gtk1/private.h"

 
 #include <gdk/gdk.h>
 #include <gdk/gdkprivate.h>
 
 #include <gdk/gdk.h>
 #include <gdk/gdkprivate.h>


@@ -112,7 +114,6 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
 // "draw" of m_mainWidget
 //-----------------------------------------------------------------------------
 
 // "draw" of m_mainWidget
 //-----------------------------------------------------------------------------
 

-#ifndef __WXGTK20__

 extern "C" {
 static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNUSED(rect), wxFrame *win )
 {
 extern "C" {
 static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNUSED(rect), wxFrame *win )
 {


@@ -154,7 +155,6 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU
     }
 }
 }
     }
 }
 }

-#endif

 
 //-----------------------------------------------------------------------------
 // "button_press_event" of m_mainWidget
 
 //-----------------------------------------------------------------------------
 // "button_press_event" of m_mainWidget


@@ -221,7 +221,7 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
 
     if (!win->m_isDragging) return TRUE;
 
 
     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;
 
     int x = (int)gdk_event->x;
     int y = (int)gdk_event->y;


@@ -379,10 +379,8 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
     gtk_signal_connect( GTK_OBJECT(m_mainWidget), "expose_event",
         GTK_SIGNAL_FUNC(gtk_window_own_expose_callback), (gpointer)this );
 
     gtk_signal_connect( GTK_OBJECT(m_mainWidget), "expose_event",
         GTK_SIGNAL_FUNC(gtk_window_own_expose_callback), (gpointer)this );
 

-#ifndef __WXGTK20__

     gtk_signal_connect( GTK_OBJECT(m_mainWidget), "draw",
        GTK_SIGNAL_FUNC(gtk_window_own_draw_callback), (gpointer)this );
     gtk_signal_connect( GTK_OBJECT(m_mainWidget), "draw",
        GTK_SIGNAL_FUNC(gtk_window_own_draw_callback), (gpointer)this );

-#endif

 
     /* these are required for dragging the mini frame around */
     gtk_signal_connect( GTK_OBJECT(m_mainWidget), "button_press_event",
 
     /* these are required for dragging the mini frame around */
     gtk_signal_connect( GTK_OBJECT(m_mainWidget), "button_press_event",


@@ -401,11 +399,7 @@ void wxMiniFrame::SetTitle( const wxString &title )
 {
     wxFrame::SetTitle( title );
 
 {
     wxFrame::SetTitle( title );
 

-#ifdef __WXGTK20__
-    gdk_window_invalidate_rect( GTK_PIZZA(m_mainWidget)->bin_window, NULL, true );
-#else

     gtk_widget_draw( m_mainWidget, (GdkRectangle*) NULL );
     gtk_widget_draw( m_mainWidget, (GdkRectangle*) NULL );

-#endif

 }
 
 }
 

-#endif
+#endif // wxUSE_MINIFRAME