#include "wx/menu.h"
#include "wx/statusbr.h"
#include "wx/intl.h"
+#include "wx/settings.h"
#include "gdk/gdkprivate.h"
#include "gdk/gdkkeysyms.h"
this is (in most cases) the only GTK widget the class manages. E.g. the
wxStatitText class handles only a GtkLabel widget a pointer to which you
can find in m_widget (defined in wxWindow)
-
+
When the class has a client area for drawing into and for containing children
- it has to handle the client area widget (of the type GtkMyFixed, defined in
- win_gtk.c), but there could be any number of widgets, handled by a class
- The common rule for all windows is only, that the widget that interacts with
- the rest of GTK must be referenced in m_widget and all other widgets must be
- children of this widget on the GTK level. The top-most widget, which also
- represents the client area, must be in the m_wxwindow field and must be of
+ it has to handle the client area widget (of the type GtkMyFixed, defined in
+ win_gtk.c), but there could be any number of widgets, handled by a class
+ The common rule for all windows is only, that the widget that interacts with
+ the rest of GTK must be referenced in m_widget and all other widgets must be
+ children of this widget on the GTK level. The top-most widget, which also
+ represents the client area, must be in the m_wxwindow field and must be of
the type GtkMyFixed.
As I said, the window classes that display a GTK native widget only have
*/
+//-------------------------------------------------------------------------
+// conditional compilation
+//-------------------------------------------------------------------------
+
+#if (GTK_MINOR_VERSION == 1)
+#if (GTK_MICRO_VERSION >= 5)
+#define NEW_GTK_SCROLL_CODE
+#endif
+#endif
+
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
extern wxList wxPendingDelete;
extern wxList wxTopLevelWindows;
extern bool g_blockEventsOnDrag;
+extern bool g_blockEventsOnScroll;
static bool g_capturing = FALSE;
// hack: we need something to pass to gtk_menu_popup, so we store the time of
static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_event, wxWindow *win )
{
if (!win->HasVMT()) return;
- if (g_blockEventsOnDrag) return;
win->m_updateRegion.Union( gdk_event->area.x,
gdk_event->area.y,
static void gtk_window_draw_callback( GtkWidget *WXUNUSED(widget), GdkRectangle *rect, wxWindow *win )
{
if (!win->HasVMT()) return;
- if (g_blockEventsOnDrag) return;
win->m_updateRegion.Union( rect->x, rect->y, rect->width, rect->height );
if (!win->IsOwnGtkWindow( gdk_event->window )) return TRUE;
if (g_blockEventsOnDrag) return TRUE;
+ if (g_blockEventsOnScroll) return TRUE;
if (win->m_wxwindow)
{
if (!g_capturing)
{
- wxNode *node = win->GetChildren()->First();
+ wxNode *node = win->GetChildren().First();
while (node)
{
wxWindow *child = (wxWindow*)node->Data();
if (!win->IsOwnGtkWindow( gdk_event->window )) return TRUE;
if (g_blockEventsOnDrag) return TRUE;
+ if (g_blockEventsOnScroll) return TRUE;
if (!win->HasVMT()) return TRUE;
if (!g_capturing)
{
- wxNode *node = win->GetChildren()->First();
+ wxNode *node = win->GetChildren().First();
while (node)
{
wxWindow *child = (wxWindow*)node->Data();
if (!win->IsOwnGtkWindow( gdk_event->window )) return TRUE;
if (g_blockEventsOnDrag) return TRUE;
+ if (g_blockEventsOnScroll) return TRUE;
if (!win->HasVMT()) return TRUE;
if (!g_capturing)
{
- wxNode *node = win->GetChildren()->First();
+ wxNode *node = win->GetChildren().First();
while (node)
{
wxWindow *child = (wxWindow*)node->Data();
float line_step = win->m_vAdjust->step_increment;
float page_step = win->m_vAdjust->page_increment;
- if (fabs(diff-line_step) < 0.2) command = wxEVT_SCROLL_LINEDOWN;
- else if (fabs(diff+line_step) < 0.2) command = wxEVT_SCROLL_LINEUP;
- else if (fabs(diff-page_step) < 0.2) command = wxEVT_SCROLL_PAGEDOWN;
- else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLL_PAGEUP;
- else command = wxEVT_SCROLL_THUMBTRACK;
+ if (win->m_isScrolling)
+ {
+ command = wxEVT_SCROLL_THUMBTRACK;
+ }
+ else
+ {
+ if (fabs(win->m_vAdjust->value-win->m_vAdjust->lower) < 0.2) command = wxEVT_SCROLL_BOTTOM;
+ else if (fabs(win->m_vAdjust->value-win->m_vAdjust->upper) < 0.2) command = wxEVT_SCROLL_TOP;
+ else if (fabs(diff-line_step) < 0.2) command = wxEVT_SCROLL_LINEDOWN;
+ else if (fabs(diff+line_step) < 0.2) command = wxEVT_SCROLL_LINEUP;
+ else if (fabs(diff-page_step) < 0.2) command = wxEVT_SCROLL_PAGEDOWN;
+ else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLL_PAGEUP;
+ else command = wxEVT_SCROLL_THUMBTRACK;
+ }
int value = (int)(win->m_vAdjust->value+0.5);
float line_step = win->m_hAdjust->step_increment;
float page_step = win->m_hAdjust->page_increment;
- if (fabs(diff-line_step) < 0.2) command = wxEVT_SCROLL_LINEDOWN;
- else if (fabs(diff+line_step) < 0.2) command = wxEVT_SCROLL_LINEUP;
- else if (fabs(diff-page_step) < 0.2) command = wxEVT_SCROLL_PAGEDOWN;
- else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLL_PAGEUP;
- else command = wxEVT_SCROLL_THUMBTRACK;
+ if (win->m_isScrolling)
+ {
+ command = wxEVT_SCROLL_THUMBTRACK;
+ }
+ else
+ {
+ if (fabs(win->m_hAdjust->value-win->m_hAdjust->lower) < 0.2) command = wxEVT_SCROLL_BOTTOM;
+ else if (fabs(win->m_hAdjust->value-win->m_hAdjust->upper) < 0.2) command = wxEVT_SCROLL_TOP;
+ else if (fabs(diff-line_step) < 0.2) command = wxEVT_SCROLL_LINEDOWN;
+ else if (fabs(diff+line_step) < 0.2) command = wxEVT_SCROLL_LINEUP;
+ else if (fabs(diff-page_step) < 0.2) command = wxEVT_SCROLL_PAGEDOWN;
+ else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLL_PAGEUP;
+ else command = wxEVT_SCROLL_THUMBTRACK;
+ }
int value = (int)(win->m_hAdjust->value+0.5);
// "button_press_event" from scrollbar
//-----------------------------------------------------------------------------
-static gint gtk_scrollbar_button_press_callback( GtkRange *widget, GdkEventButton *gdk_event, wxWindow *win )
+static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget),
+ GdkEventButton *WXUNUSED(gdk_event),
+ wxWindow *win )
{
- if (gdk_event->window != widget->slider) return FALSE;
+// if (gdk_event->window != widget->slider) return FALSE;
win->m_isScrolling = TRUE;
+ g_blockEventsOnScroll = TRUE;
return FALSE;
}
// "button_release_event" from scrollbar
//-----------------------------------------------------------------------------
-static gint gtk_scrollbar_button_release_callback( GtkRange *widget, GdkEventButton *gdk_event, wxWindow *win )
+static gint gtk_scrollbar_button_release_callback( GtkRange *widget,
+ GdkEventButton *WXUNUSED(gdk_event),
+ wxWindow *win )
{
- if (gdk_event->window != widget->slider) return FALSE;
+
+// don't test here as we can reelase the mouse while being over
+// a different window then the slider
+//
+// if (gdk_event->window != widget->slider) return FALSE;
GtkScrolledWindow *s_window = GTK_SCROLLED_WINDOW(win->m_widget);
gtk_signal_emit_by_name( GTK_OBJECT(win->m_vAdjust), "value_changed" );
win->m_isScrolling = FALSE;
+ g_blockEventsOnScroll = FALSE;
return FALSE;
}
-//-----------------------------------------------------------------------------
-// "drop_data_available_event"
-//-----------------------------------------------------------------------------
-
-static void gtk_window_drop_callback( GtkWidget *widget, GdkEventDropDataAvailable *event, wxWindow *win )
-{
- if (!win->HasVMT()) return;
-
- if (win->GetDropTarget())
- {
- int x = 0;
- int y = 0;
- gdk_window_get_pointer( widget->window, &x, &y, (GdkModifierType *) NULL );
-
- printf( "Drop data is of type %s.\n", event->data_type );
-
- win->GetDropTarget()->OnDrop( x, y, (const void*)event->data, (size_t)event->data_numbytes );
- }
-
-/*
- g_free (event->dropdataavailable.data);
- g_free (event->dropdataavailable.data_type);
-*/
-}
-
//-----------------------------------------------------------------------------
// InsertChild for wxWindow.
//-----------------------------------------------------------------------------
// Callback for wxWindow. This very strange beast has to be used because
-// C++ has no virtual methods in a constructor. We have to emulate a
+// C++ has no virtual methods in a constructor. We have to emulate a
// virtual function here as wxNotebook requires a different way to insert
// a child in it. I had opted for creating a wxNotebookPage window class
// which would have made this superflouus (such in the MDI window system),
static void wxInsertChildInWindow( wxWindow* parent, wxWindow* child )
{
- gtk_myfixed_put( GTK_MYFIXED(parent->m_wxwindow),
- GTK_WIDGET(child->m_widget),
- child->m_x,
+ gtk_myfixed_put( GTK_MYFIXED(parent->m_wxwindow),
+ GTK_WIDGET(child->m_widget),
+ child->m_x,
child->m_y );
- gtk_widget_set_usize( GTK_WIDGET(child->m_widget),
- child->m_width,
+ gtk_widget_set_usize( GTK_WIDGET(child->m_widget),
+ child->m_width,
child->m_height );
}
m_wxwindow = (GtkWidget *) NULL;
m_parent = (wxWindow *) NULL;
m_children.DeleteContents( FALSE );
-
+
m_x = 0;
m_y = 0;
m_width = 0;
m_minHeight = -1;
m_maxWidth = -1;
m_maxHeight = -1;
-
+
m_retCode = 0;
-
+
m_eventHandler = this;
m_windowValidator = (wxValidator *) NULL;
-
+
m_windowId = -1;
-
+
m_cursor = (wxCursor *) NULL;
m_font = *wxSWISS_FONT;
m_windowStyle = 0;
m_windowName = "noname";
-
+
m_constraints = (wxLayoutConstraints *) NULL;
m_constraintsInvolvedIn = (wxList *) NULL;
m_windowSizer = (wxSizer *) NULL;
m_sizerParent = (wxWindow *) NULL;
m_autoLayout = FALSE;
-
+
m_sizeSet = FALSE;
m_hasVMT = FALSE;
m_needParent = TRUE;
-
+
m_hasScrolling = FALSE;
m_isScrolling = FALSE;
m_hAdjust = (GtkAdjustment*) NULL;
m_vAdjust = (GtkAdjustment*) NULL;
m_oldHorizontalPos = 0.0;
m_oldVerticalPos = 0.0;
-
+
m_isShown = FALSE;
m_isEnabled = TRUE;
-
+
m_dropTarget = (wxDropTarget*) NULL;
m_resizing = FALSE;
m_scrollGC = (GdkGC*) NULL;
m_widgetStyle = (GtkStyle*) NULL;
-
+
m_insertCallback = wxInsertChildInWindow;
-
+
m_clientObject = (wxClientData*) NULL;
m_clientData = NULL;
}
m_insertCallback = wxInsertChildInWindow;
Create( parent, id, pos, size, style, name );
}
-
+
bool wxWindow::Create( wxWindow *parent, wxWindowID id,
const wxPoint &pos, const wxSize &size,
long style, const wxString &name )
PreCreation( parent, id, pos, size, style, name );
m_widget = gtk_scrolled_window_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
- m_hasScrolling = TRUE;
+ GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
GtkScrolledWindow *s_window = GTK_SCROLLED_WINDOW(m_widget);
- gtk_signal_connect( GTK_OBJECT(s_window->vscrollbar), "button_press_event",
- (GtkSignalFunc)gtk_scrollbar_button_press_callback, (gpointer) this );
-
- gtk_signal_connect( GTK_OBJECT(s_window->hscrollbar), "button_press_event",
- (GtkSignalFunc)gtk_scrollbar_button_press_callback, (gpointer) this );
-
- gtk_signal_connect( GTK_OBJECT(s_window->vscrollbar), "button_release_event",
- (GtkSignalFunc)gtk_scrollbar_button_release_callback, (gpointer) this );
-
- gtk_signal_connect( GTK_OBJECT(s_window->hscrollbar), "button_release_event",
- (GtkSignalFunc)gtk_scrollbar_button_release_callback, (gpointer) this );
-
GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
scroll_class->scrollbar_spacing = 0;
m_hAdjust = gtk_range_get_adjustment( GTK_RANGE(s_window->hscrollbar) );
m_vAdjust = gtk_range_get_adjustment( GTK_RANGE(s_window->vscrollbar) );
- gtk_signal_connect( GTK_OBJECT(m_hAdjust), "value_changed",
- (GtkSignalFunc) gtk_window_hscroll_callback, (gpointer) this );
- gtk_signal_connect( GTK_OBJECT(m_vAdjust), "value_changed",
- (GtkSignalFunc) gtk_window_vscroll_callback, (gpointer) this );
-
- gtk_signal_connect( GTK_OBJECT(m_hAdjust), "changed",
- (GtkSignalFunc) gtk_window_hscroll_change_callback, (gpointer) this );
- gtk_signal_connect(GTK_OBJECT(m_vAdjust), "changed",
- (GtkSignalFunc) gtk_window_vscroll_change_callback, (gpointer) this );
+ m_wxwindow = gtk_myfixed_new();
+#ifdef NEW_GTK_SCROLL_CODE
+ gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(m_widget), m_wxwindow );
+ GtkViewport *viewport = GTK_VIEWPORT(s_window->child);
+#else
+ gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );
GtkViewport *viewport = GTK_VIEWPORT(s_window->viewport);
+#endif
if (m_windowStyle & wxRAISED_BORDER)
{
gtk_viewport_set_shadow_type( viewport, GTK_SHADOW_NONE );
}
- m_wxwindow = gtk_myfixed_new();
-
- GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
-
if (m_windowStyle & wxTAB_TRAVERSAL == wxTAB_TRAVERSAL)
GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
else
GTK_WIDGET_SET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
- gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );
-
// shut the viewport up
gtk_viewport_set_hadjustment( viewport, (GtkAdjustment*) gtk_adjustment_new( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) );
gtk_viewport_set_vadjustment( viewport, (GtkAdjustment*) gtk_adjustment_new( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) );
m_hAdjust->page_size = 5.0;
gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );
+ // these handlers block mouse events to any window during scrolling
+ // such as motion events and prevent GTK and wxWindows from fighting
+ // over where the slider should be
+
+ gtk_signal_connect( GTK_OBJECT(s_window->vscrollbar), "button_press_event",
+ (GtkSignalFunc)gtk_scrollbar_button_press_callback, (gpointer) this );
+
+ gtk_signal_connect( GTK_OBJECT(s_window->hscrollbar), "button_press_event",
+ (GtkSignalFunc)gtk_scrollbar_button_press_callback, (gpointer) this );
+
+ gtk_signal_connect( GTK_OBJECT(s_window->vscrollbar), "button_release_event",
+ (GtkSignalFunc)gtk_scrollbar_button_release_callback, (gpointer) this );
+
+ gtk_signal_connect( GTK_OBJECT(s_window->hscrollbar), "button_release_event",
+ (GtkSignalFunc)gtk_scrollbar_button_release_callback, (gpointer) this );
+
+ // these handers het notified when screen updates are required either when
+ // scrolling or when the window size (and therefore scrollbar configuration)
+ // has changed
+
+ gtk_signal_connect( GTK_OBJECT(m_hAdjust), "value_changed",
+ (GtkSignalFunc) gtk_window_hscroll_callback, (gpointer) this );
+ gtk_signal_connect( GTK_OBJECT(m_vAdjust), "value_changed",
+ (GtkSignalFunc) gtk_window_vscroll_callback, (gpointer) this );
+
+ gtk_signal_connect( GTK_OBJECT(m_hAdjust), "changed",
+ (GtkSignalFunc) gtk_window_hscroll_change_callback, (gpointer) this );
+ gtk_signal_connect(GTK_OBJECT(m_vAdjust), "changed",
+ (GtkSignalFunc) gtk_window_vscroll_change_callback, (gpointer) this );
+
gtk_widget_show( m_wxwindow );
-
+
if (m_parent) m_parent->AddChild( this );
(m_parent->m_insertCallback)( m_parent, this );
-
+
PostCreation();
-
+
Show( TRUE );
return TRUE;
wxWindow::~wxWindow()
{
- m_hasVMT = FALSE;
+ m_hasVMT = FALSE;
- if (m_dropTarget) delete m_dropTarget;
+ if (m_dropTarget) delete m_dropTarget;
- if (m_parent) m_parent->RemoveChild( this );
- if (m_widget) Show( FALSE );
+ if (m_parent) m_parent->RemoveChild( this );
+ if (m_widget) Show( FALSE );
- DestroyChildren();
+ DestroyChildren();
- if (m_widgetStyle) gtk_style_unref( m_widgetStyle );
-
- if (m_scrollGC) gdk_gc_unref( m_scrollGC );
-
- if (m_wxwindow) gtk_widget_destroy( m_wxwindow );
+ if (m_widgetStyle) gtk_style_unref( m_widgetStyle );
- if (m_widget) gtk_widget_destroy( m_widget );
+ if (m_scrollGC) gdk_gc_unref( m_scrollGC );
- wxDELETE(m_cursor);
+ if (m_wxwindow) gtk_widget_destroy( m_wxwindow );
- DeleteRelatedConstraints();
- if (m_constraints)
- {
- // This removes any dangling pointers to this window
- // in other windows' constraintsInvolvedIn lists.
- UnsetConstraints(m_constraints);
- delete m_constraints;
- m_constraints = (wxLayoutConstraints *) NULL;
- }
- if (m_windowSizer)
- {
- delete m_windowSizer;
- m_windowSizer = (wxSizer *) NULL;
- }
- // If this is a child of a sizer, remove self from parent
- if (m_sizerParent) m_sizerParent->RemoveChild((wxWindow *)this);
+ if (m_widget) gtk_widget_destroy( m_widget );
- // Just in case the window has been Closed, but
- // we're then deleting immediately: don't leave
- // dangling pointers.
- wxPendingDelete.DeleteObject(this);
+ if (m_cursor) delete m_cursor;
- // Just in case we've loaded a top-level window via
- // wxWindow::LoadNativeDialog but we weren't a dialog
- // class
- wxTopLevelWindows.DeleteObject(this);
+ DeleteRelatedConstraints();
+ if (m_constraints)
+ {
+ // This removes any dangling pointers to this window
+ // in other windows' constraintsInvolvedIn lists.
+ UnsetConstraints(m_constraints);
+ delete m_constraints;
+ m_constraints = (wxLayoutConstraints *) NULL;
+ }
+ if (m_windowSizer)
+ {
+ delete m_windowSizer;
+ m_windowSizer = (wxSizer *) NULL;
+ }
+ // If this is a child of a sizer, remove self from parent
+ if (m_sizerParent) m_sizerParent->RemoveChild((wxWindow *)this);
- if (m_windowValidator) delete m_windowValidator;
-
- if (m_clientObject) delete m_clientObject;
+ // Just in case the window has been Closed, but
+ // we're then deleting immediately: don't leave
+ // dangling pointers.
+ wxPendingDelete.DeleteObject(this);
+
+ // Just in case we've loaded a top-level window via
+ // wxWindow::LoadNativeDialog but we weren't a dialog
+ // class
+ wxTopLevelWindows.DeleteObject(this);
+
+ if (m_windowValidator) delete m_windowValidator;
+
+ if (m_clientObject) delete m_clientObject;
}
void wxWindow::PreCreation( wxWindow *parent, wxWindowID id,
const wxPoint &pos, const wxSize &size,
long style, const wxString &name )
{
- if (m_needParent && (parent == NULL))
- wxFatalError( "Need complete parent.", name );
-
- m_widget = (GtkWidget*) NULL;
- m_wxwindow = (GtkWidget*) NULL;
- m_hasVMT = FALSE;
- m_parent = parent;
- m_children.DeleteContents( FALSE );
-
- m_width = size.x;
- if (m_width == -1) m_width = 20;
- m_height = size.y;
- if (m_height == -1) m_height = 20;
-
- m_x = (int)pos.x;
- m_y = (int)pos.y;
-
- if (!m_needParent) // some reasonable defaults
- {
- if (m_x == -1)
- {
- m_x = (gdk_screen_width () - m_width) / 2;
- if (m_x < 10) m_x = 10;
- }
- if (m_y == -1)
+ if (m_needParent && (parent == NULL))
+ wxFatalError( "Need complete parent.", name );
+
+ m_widget = (GtkWidget*) NULL;
+ m_wxwindow = (GtkWidget*) NULL;
+ m_hasVMT = FALSE;
+ m_parent = parent;
+ m_children.DeleteContents( FALSE );
+
+ m_width = size.x;
+ if (m_width == -1) m_width = 20;
+ m_height = size.y;
+ if (m_height == -1) m_height = 20;
+
+ m_x = (int)pos.x;
+ m_y = (int)pos.y;
+
+ if (!m_needParent) // some reasonable defaults
{
- m_y = (gdk_screen_height () - m_height) / 2;
- if (m_y < 10) m_y = 10;
+ if (m_x == -1)
+ {
+ m_x = (gdk_screen_width () - m_width) / 2;
+ if (m_x < 10) m_x = 10;
+ }
+ if (m_y == -1)
+ {
+ m_y = (gdk_screen_height () - m_height) / 2;
+ if (m_y < 10) m_y = 10;
+ }
}
- }
-
- m_minWidth = -1;
- m_minHeight = -1;
- m_maxWidth = -1;
- m_maxHeight = -1;
-
- m_retCode = 0;
-
- m_eventHandler = this;
-
- m_windowId = id;
-
- m_sizeSet = FALSE;
-
- m_cursor = new wxCursor( wxCURSOR_ARROW );
- m_font = *wxSWISS_FONT;
+
+ m_minWidth = -1;
+ m_minHeight = -1;
+ m_maxWidth = -1;
+ m_maxHeight = -1;
+
+ m_retCode = 0;
+
+ m_eventHandler = this;
+
+ m_windowId = id == -1 ? wxNewId() : id;
+
+ m_sizeSet = FALSE;
+
+ m_cursor = new wxCursor( wxCURSOR_ARROW );
+ m_font = *wxSWISS_FONT;
// m_backgroundColour = wxWHITE;
// m_foregroundColour = wxBLACK;
- m_windowStyle = style;
- m_windowName = name;
-
- m_constraints = (wxLayoutConstraints *) NULL;
- m_constraintsInvolvedIn = (wxList *) NULL;
- m_windowSizer = (wxSizer *) NULL;
- m_sizerParent = (wxWindow *) NULL;
- m_autoLayout = FALSE;
-
- m_hasScrolling = FALSE;
- m_isScrolling = FALSE;
- m_hAdjust = (GtkAdjustment *) NULL;
- m_vAdjust = (GtkAdjustment *) NULL;
- m_oldHorizontalPos = 0.0;
- m_oldVerticalPos = 0.0;
-
- m_isShown = FALSE;
- m_isEnabled = TRUE;
-
- m_dropTarget = (wxDropTarget *) NULL;
- m_resizing = FALSE;
- m_windowValidator = (wxValidator *) NULL;
- m_scrollGC = (GdkGC*) NULL;
- m_widgetStyle = (GtkStyle*) NULL;
-
- m_clientObject = (wxClientData*)NULL;
- m_clientData = NULL;
+ m_windowStyle = style;
+ m_windowName = name;
+
+ m_constraints = (wxLayoutConstraints *) NULL;
+ m_constraintsInvolvedIn = (wxList *) NULL;
+ m_windowSizer = (wxSizer *) NULL;
+ m_sizerParent = (wxWindow *) NULL;
+ m_autoLayout = FALSE;
+
+ m_hasScrolling = FALSE;
+ m_isScrolling = FALSE;
+ m_hAdjust = (GtkAdjustment *) NULL;
+ m_vAdjust = (GtkAdjustment *) NULL;
+ m_oldHorizontalPos = 0.0;
+ m_oldVerticalPos = 0.0;
+
+ m_isShown = FALSE;
+ m_isEnabled = TRUE;
+
+ m_dropTarget = (wxDropTarget *) NULL;
+ m_resizing = FALSE;
+ m_windowValidator = (wxValidator *) NULL;
+ m_scrollGC = (GdkGC*) NULL;
+ m_widgetStyle = (GtkStyle*) NULL;
+
+ m_clientObject = (wxClientData*)NULL;
+ m_clientData = NULL;
}
void wxWindow::PostCreation()
{
- if (m_wxwindow)
- {
- gtk_signal_connect( GTK_OBJECT(m_wxwindow), "expose_event",
- GTK_SIGNAL_FUNC(gtk_window_expose_callback), (gpointer)this );
+ if (m_wxwindow)
+ {
+ gtk_signal_connect( GTK_OBJECT(m_wxwindow), "expose_event",
+ GTK_SIGNAL_FUNC(gtk_window_expose_callback), (gpointer)this );
- gtk_signal_connect( GTK_OBJECT(m_wxwindow), "draw",
- GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this );
- }
+ gtk_signal_connect( GTK_OBJECT(m_wxwindow), "draw",
+ GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this );
+ }
- ConnectWidget( GetConnectWidget() );
+ ConnectWidget( GetConnectWidget() );
- if (m_widget && m_parent) gtk_widget_realize( m_widget );
+ if (m_widget && m_parent) gtk_widget_realize( m_widget );
- if (m_wxwindow) gtk_widget_realize( m_wxwindow );
+ if (m_wxwindow) gtk_widget_realize( m_wxwindow );
- SetCursor( *wxSTANDARD_CURSOR );
+ SetCursor( *wxSTANDARD_CURSOR );
- m_hasVMT = TRUE;
+ m_hasVMT = TRUE;
}
void wxWindow::ConnectWidget( GtkWidget *widget )
{
- gtk_signal_connect( GTK_OBJECT(widget), "key_press_event",
- GTK_SIGNAL_FUNC(gtk_window_key_press_callback), (gpointer)this );
+ gtk_signal_connect( GTK_OBJECT(widget), "key_press_event",
+ GTK_SIGNAL_FUNC(gtk_window_key_press_callback), (gpointer)this );
- gtk_signal_connect( GTK_OBJECT(widget), "button_press_event",
- GTK_SIGNAL_FUNC(gtk_window_button_press_callback), (gpointer)this );
+ gtk_signal_connect( GTK_OBJECT(widget), "button_press_event",
+ GTK_SIGNAL_FUNC(gtk_window_button_press_callback), (gpointer)this );
- gtk_signal_connect( GTK_OBJECT(widget), "button_release_event",
- GTK_SIGNAL_FUNC(gtk_window_button_release_callback), (gpointer)this );
+ gtk_signal_connect( GTK_OBJECT(widget), "button_release_event",
+ GTK_SIGNAL_FUNC(gtk_window_button_release_callback), (gpointer)this );
- gtk_signal_connect( GTK_OBJECT(widget), "motion_notify_event",
- GTK_SIGNAL_FUNC(gtk_window_motion_notify_callback), (gpointer)this );
+ gtk_signal_connect( GTK_OBJECT(widget), "motion_notify_event",
+ GTK_SIGNAL_FUNC(gtk_window_motion_notify_callback), (gpointer)this );
- gtk_signal_connect( GTK_OBJECT(widget), "focus_in_event",
- GTK_SIGNAL_FUNC(gtk_window_focus_in_callback), (gpointer)this );
+ gtk_signal_connect( GTK_OBJECT(widget), "focus_in_event",
+ GTK_SIGNAL_FUNC(gtk_window_focus_in_callback), (gpointer)this );
- gtk_signal_connect( GTK_OBJECT(widget), "focus_out_event",
- GTK_SIGNAL_FUNC(gtk_window_focus_out_callback), (gpointer)this );
+ gtk_signal_connect( GTK_OBJECT(widget), "focus_out_event",
+ GTK_SIGNAL_FUNC(gtk_window_focus_out_callback), (gpointer)this );
- gtk_signal_connect( GTK_OBJECT(widget), "enter_notify_event",
- GTK_SIGNAL_FUNC(gtk_window_enter_callback), (gpointer)this );
+ gtk_signal_connect( GTK_OBJECT(widget), "enter_notify_event",
+ GTK_SIGNAL_FUNC(gtk_window_enter_callback), (gpointer)this );
- gtk_signal_connect( GTK_OBJECT(widget), "leave_notify_event",
- GTK_SIGNAL_FUNC(gtk_window_leave_callback), (gpointer)this );
+ gtk_signal_connect( GTK_OBJECT(widget), "leave_notify_event",
+ GTK_SIGNAL_FUNC(gtk_window_leave_callback), (gpointer)this );
}
bool wxWindow::HasVMT()
{
- return m_hasVMT;
+ return m_hasVMT;
}
bool wxWindow::Close( bool force )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxASSERT_MSG( (m_widget != NULL), "invalid window" );
- wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId);
- event.SetEventObject(this);
- event.SetForce(force);
+ wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId);
+ event.SetEventObject(this);
+ event.SetForce(force);
- return GetEventHandler()->ProcessEvent(event);
+ return GetEventHandler()->ProcessEvent(event);
}
bool wxWindow::Destroy()
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxASSERT_MSG( (m_widget != NULL), "invalid window" );
- m_hasVMT = FALSE;
- delete this;
- return TRUE;
+ m_hasVMT = FALSE;
+ delete this;
+ return TRUE;
}
bool wxWindow::DestroyChildren()
{
- if (GetChildren())
- {
wxNode *node;
- while ((node = GetChildren()->First()) != (wxNode *)NULL)
+ while ((node = m_children.First()) != (wxNode *)NULL)
{
- wxWindow *child;
- if ((child = (wxWindow *)node->Data()) != (wxWindow *)NULL)
- {
- delete child;
- if (GetChildren()->Member(child)) delete node;
- }
+ wxWindow *child;
+ if ((child = (wxWindow *)node->Data()) != (wxWindow *)NULL)
+ {
+ delete child;
+ if (m_children.Member(child)) delete node;
+ }
}
- }
- return TRUE;
+ return TRUE;
}
void wxWindow::PrepareDC( wxDC &WXUNUSED(dc) )
{
- // are we to set fonts here ?
+ // are we to set fonts here ?
}
wxPoint wxWindow::GetClientAreaOrigin() const
{
- return wxPoint(0,0);
+ return wxPoint(0,0);
}
void wxWindow::AdjustForParentClientOrigin( int& x, int& y, int sizeFlags )
{
- if (((sizeFlags & wxSIZE_NO_ADJUSTMENTS) == 0) && GetParent())
- {
- wxPoint pt(GetParent()->GetClientAreaOrigin());
- x += pt.x;
- y += pt.y;
- }
+ if (((sizeFlags & wxSIZE_NO_ADJUSTMENTS) == 0) && GetParent())
+ {
+ wxPoint pt(GetParent()->GetClientAreaOrigin());
+ x += pt.x;
+ y += pt.y;
+ }
}
void wxWindow::SetSize( int x, int y, int width, int height, int sizeFlags )
{
wxASSERT_MSG( (m_widget != NULL), "invalid window" );
wxASSERT_MSG( (m_parent != NULL), "wxWindow::SetSize requires parent.\n" );
-
- // Don't do anything for children of wxNotebook
- if (m_parent->m_wxwindow == NULL) return;
if (m_resizing) return; // I don't like recursions
m_resizing = TRUE;
- int old_width = m_width;
- int old_height = m_height;
-
- if ((sizeFlags & wxSIZE_USE_EXISTING) == wxSIZE_USE_EXISTING)
- {
- if (x != -1) m_x = x;
- if (y != -1) m_y = y;
- if (width != -1) m_width = width;
- if (height != -1) m_height = height;
- }
- else
+ if (m_parent->m_wxwindow == NULL) // i.e. wxNotebook
{
+ // don't set the size for children of wxNotebook, just take the values.
m_x = x;
m_y = y;
m_width = width;
- m_height = height;
+ m_height = height;
}
-
- if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)
+ else
{
- if (width == -1) m_width = 80;
- }
+ int old_width = m_width;
+ int old_height = m_height;
- if ((sizeFlags & wxSIZE_AUTO_HEIGHT) == wxSIZE_AUTO_HEIGHT)
- {
- if (height == -1) m_height = 26;
+ if ((sizeFlags & wxSIZE_USE_EXISTING) == wxSIZE_USE_EXISTING)
+ {
+ if (x != -1) m_x = x;
+ if (y != -1) m_y = y;
+ if (width != -1) m_width = width;
+ if (height != -1) m_height = height;
+ }
+ else
+ {
+ m_x = x;
+ m_y = y;
+ m_width = width;
+ m_height = height;
+ }
+
+ if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)
+ {
+ if (width == -1) m_width = 80;
+ }
+
+ if ((sizeFlags & wxSIZE_AUTO_HEIGHT) == wxSIZE_AUTO_HEIGHT)
+ {
+ if (height == -1) m_height = 26;
+ }
+
+ if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
+ if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;
+ if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_minWidth;
+ if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_minHeight;
+
+ wxPoint pt( m_parent->GetClientAreaOrigin() );
+ gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), m_widget, m_x+pt.x, m_y+pt.y );
+
+ if ((old_width != m_width) || (old_height != m_height))
+ gtk_widget_set_usize( m_widget, m_width, m_height );
}
-
- if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
- if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;
- if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_minWidth;
- if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_minHeight;
-
- wxPoint pt( m_parent->GetClientAreaOrigin() );
- gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), m_widget, m_x+pt.x, m_y+pt.y );
-
- if ((old_width != m_width) || (old_height != m_height))
- gtk_widget_set_usize( m_widget, m_width, m_height );
-
+
m_sizeSet = TRUE;
wxSizeEvent event( wxSize(m_width,m_height), GetId() );
event.SetEventObject( this );
- ProcessEvent( event );
+ GetEventHandler()->ProcessEvent( event );
m_resizing = FALSE;
}
if (!m_hasScrolling)
{
-/*
- do we have sunken dialogs ?
-
GtkStyleClass *window_class = m_wxwindow->style->klass;
- dw += 2 * window_class->xthickness;
- dh += 2 * window_class->ythickness;
-*/
+ if ((m_windowStyle & wxRAISED_BORDER) ||
+ (m_windowStyle & wxSUNKEN_BORDER))
+ {
+ dw += 2 * window_class->xthickness;
+ dh += 2 * window_class->ythickness;
+ }
}
else
{
GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
+#ifdef NEW_GTK_SCROLL_CODE
+ GtkWidget *viewport = scroll_window->child;
+#else
GtkWidget *viewport = scroll_window->viewport;
+#endif
+
GtkStyleClass *viewport_class = viewport->style->klass;
GtkWidget *hscrollbar = scroll_window->hscrollbar;
dh += 2 * viewport_class->ythickness;
}
- if (GTK_WIDGET_VISIBLE(vscrollbar))
+ if (scroll_window->vscrollbar_visible)
{
dw += vscrollbar->allocation.width;
dw += scroll_class->scrollbar_spacing;
}
- if (GTK_WIDGET_VISIBLE(hscrollbar))
+ if (scroll_window->hscrollbar_visible)
{
dh += hscrollbar->allocation.height;
dw += scroll_class->scrollbar_spacing;
if (!m_hasScrolling)
{
-/*
- do we have sunken dialogs ?
-
GtkStyleClass *window_class = m_wxwindow->style->klass;
- dw += 2 * window_class->xthickness;
- dh += 2 * window_class->ythickness;
-*/
+ if ((m_windowStyle & wxRAISED_BORDER) ||
+ (m_windowStyle & wxSUNKEN_BORDER))
+ {
+ dw += 2 * window_class->xthickness;
+ dh += 2 * window_class->ythickness;
+ }
}
else
{
GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
+#ifdef NEW_GTK_SCROLL_CODE
+ GtkWidget *viewport = scroll_window->child;
+#else
GtkWidget *viewport = scroll_window->viewport;
- GtkStyleClass *viewport_class = viewport->style->klass;
+#endif
- GtkWidget *hscrollbar = scroll_window->hscrollbar;
- GtkWidget *vscrollbar = scroll_window->vscrollbar;
+ GtkStyleClass *viewport_class = viewport->style->klass;
if ((m_windowStyle & wxRAISED_BORDER) ||
(m_windowStyle & wxSUNKEN_BORDER))
dh += 2 * viewport_class->ythickness;
}
- if (GTK_WIDGET_VISIBLE(vscrollbar))
+ if (scroll_window->vscrollbar_visible)
{
// dw += vscrollbar->allocation.width;
dw += 15; // range.slider_width = 11 + 2*2pts edge
dw += scroll_class->scrollbar_spacing;
}
- if (GTK_WIDGET_VISIBLE(hscrollbar))
+ if (scroll_window->hscrollbar_visible)
{
// dh += hscrollbar->allocation.height;
dh += 15;
void wxWindow::GetPosition( int *x, int *y ) const
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxASSERT_MSG( (m_widget != NULL), "invalid window" );
- if (x) (*x) = m_x;
- if (y) (*y) = m_y;
+ if (x) (*x) = m_x;
+ if (y) (*y) = m_y;
}
void wxWindow::ClientToScreen( int *x, int *y )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxASSERT_MSG( (m_widget != NULL), "invalid window" );
- GdkWindow *source = (GdkWindow *) NULL;
- if (m_wxwindow)
- source = m_wxwindow->window;
- else
- source = m_widget->window;
+ GdkWindow *source = (GdkWindow *) NULL;
+ if (m_wxwindow)
+ source = m_wxwindow->window;
+ else
+ source = m_widget->window;
- int org_x = 0;
- int org_y = 0;
- gdk_window_get_origin( source, &org_x, &org_y );
+ int org_x = 0;
+ int org_y = 0;
+ gdk_window_get_origin( source, &org_x, &org_y );
- if (!m_wxwindow)
- {
- if (GTK_WIDGET_NO_WINDOW (m_widget))
+ if (!m_wxwindow)
{
- org_x += m_widget->allocation.x;
- org_y += m_widget->allocation.y;
+ if (GTK_WIDGET_NO_WINDOW (m_widget))
+ {
+ org_x += m_widget->allocation.x;
+ org_y += m_widget->allocation.y;
+ }
}
- }
- wxPoint pt(GetClientAreaOrigin());
- org_x += pt.x;
- org_y += pt.y;
-
- if (x) *x += org_x;
- if (y) *y += org_y;
+ wxPoint pt(GetClientAreaOrigin());
+ org_x += pt.x;
+ org_y += pt.y;
+
+ if (x) *x += org_x;
+ if (y) *y += org_y;
}
void wxWindow::ScreenToClient( int *x, int *y )
wxPoint pt(GetClientAreaOrigin());
org_x -= pt.x;
org_y -= pt.y;
-
+
if (x) *x -= org_x;
if (y) *y -= org_y;
}
int x = m_x;
int y = m_y;
-
+
if (m_parent)
{
int p_w = 0;
if (direction & wxHORIZONTAL == wxHORIZONTAL) x = (gdk_screen_width () - m_width) / 2;
if (direction & wxVERTICAL == wxVERTICAL) y = (gdk_screen_height () - m_height) / 2;
}
-
+
Move( x, y );
}
int maxX = 0;
int maxY = 0;
- wxNode *node = GetChildren()->First();
+ wxNode *node = m_children.First();
while ( node )
{
wxWindow *win = (wxWindow *)node->Data();
void wxWindow::OnSize( wxSizeEvent &WXUNUSED(event) )
{
- //if (GetAutoLayout()) Layout();
+// if (GetAutoLayout()) Layout();
}
bool wxWindow::Show( bool show )
int wxWindow::GetCharWidth() const
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxASSERT_MSG( (m_widget != NULL), "invalid window" );
- if (!m_font.Ok())
- {
- wxFAIL_MSG( "invalid font" );
- return -1;
- }
+ if (!m_font.Ok())
+ {
+ wxFAIL_MSG( "invalid font" );
+ return -1;
+ }
- GdkFont *font = m_font.GetInternalFont( 1.0 );
- return gdk_string_width( font, "H" );
+ GdkFont *font = m_font.GetInternalFont( 1.0 );
+ return gdk_string_width( font, "H" );
}
void wxWindow::GetTextExtent( const wxString& string, int *x, int *y,
int *descent, int *externalLeading, const wxFont *theFont, bool WXUNUSED(use16) ) const
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxASSERT_MSG( (m_widget != NULL), "invalid window" );
- wxFont fontToUse = m_font;
- if (theFont) fontToUse = *theFont;
+ wxFont fontToUse = m_font;
+ if (theFont) fontToUse = *theFont;
- if (!fontToUse.Ok())
- {
- wxFAIL_MSG( "invalid font" );
- return;
- }
- wxASSERT_MSG( (m_font.Ok()), "invalid font" );
+ if (!fontToUse.Ok())
+ {
+ wxFAIL_MSG( "invalid font" );
+ return;
+ }
+ wxASSERT_MSG( (m_font.Ok()), "invalid font" );
- GdkFont *font = fontToUse.GetInternalFont( 1.0 );
- if (x) (*x) = gdk_string_width( font, string );
- if (y) (*y) = font->ascent + font->descent;
- if (descent) (*descent) = font->descent;
- if (externalLeading) (*externalLeading) = 0; // ??
+ GdkFont *font = fontToUse.GetInternalFont( 1.0 );
+ if (x) (*x) = gdk_string_width( font, string );
+ if (y) (*y) = font->ascent + font->descent;
+ if (descent) (*descent) = font->descent;
+ if (externalLeading) (*externalLeading) = 0; // ??
}
void wxWindow::MakeModal( bool modal )
void wxWindow::SetFocus()
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxASSERT_MSG( (m_widget != NULL), "invalid window" );
- GtkWidget *connect_widget = GetConnectWidget();
- if (connect_widget)
- {
- if (GTK_WIDGET_CAN_FOCUS(connect_widget) && !GTK_WIDGET_HAS_FOCUS (connect_widget) )
+ GtkWidget *connect_widget = GetConnectWidget();
+ if (connect_widget)
{
- gtk_widget_grab_focus (connect_widget);
+ if (GTK_WIDGET_CAN_FOCUS(connect_widget) && !GTK_WIDGET_HAS_FOCUS (connect_widget) )
+ {
+ gtk_widget_grab_focus (connect_widget);
+ }
}
- }
}
bool wxWindow::OnClose()
{
- return TRUE;
+ return TRUE;
}
void wxWindow::AddChild( wxWindow *child )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
- wxASSERT_MSG( (child != NULL), "invalid child" );
+ wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxASSERT_MSG( (child != NULL), "invalid child" );
- m_children.Append( child );
+ m_children.Append( child );
}
-wxList *wxWindow::GetChildren()
+wxWindow *wxWindow::ReParent( wxWindow *newParent )
{
- return (&m_children);
+ wxWindow *oldParent = GetParent();
+
+ if (oldParent) oldParent->RemoveChild( this );
+
+ gtk_widget_unparent( m_widget );
+
+ if (newParent)
+ {
+ newParent->AddChild( this );
+ (newParent->m_insertCallback)( newParent, this );
+ }
+
+ return oldParent;
}
void wxWindow::RemoveChild( wxWindow *child )
{
- if (GetChildren()) GetChildren()->DeleteObject( child );
- child->m_parent = (wxWindow *) NULL;
+ m_children.DeleteObject( child );
+ child->m_parent = (wxWindow *) NULL;
}
void wxWindow::SetReturnCode( int retCode )
{
- m_retCode = retCode;
+ m_retCode = retCode;
}
int wxWindow::GetReturnCode()
{
- return m_retCode;
+ return m_retCode;
}
void wxWindow::Raise()
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxASSERT_MSG( (m_widget != NULL), "invalid window" );
- if (m_widget) gdk_window_raise( m_widget->window );
+ if (m_widget) gdk_window_raise( m_widget->window );
}
void wxWindow::Lower()
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxASSERT_MSG( (m_widget != NULL), "invalid window" );
- if (m_widget) gdk_window_lower( m_widget->window );
+ if (m_widget) gdk_window_lower( m_widget->window );
}
-wxEvtHandler *wxWindow::GetEventHandler()
+wxEvtHandler *wxWindow::GetEventHandler() const
{
- return m_eventHandler;
+ return m_eventHandler;
}
void wxWindow::SetEventHandler( wxEvtHandler *handler )
{
- m_eventHandler = handler;
+ m_eventHandler = handler;
}
void wxWindow::PushEventHandler(wxEvtHandler *handler)
{
- handler->SetNextHandler(GetEventHandler());
- SetEventHandler(handler);
+ handler->SetNextHandler(GetEventHandler());
+ SetEventHandler(handler);
}
wxEvtHandler *wxWindow::PopEventHandler(bool deleteHandler)
{
- if (GetEventHandler())
- {
- wxEvtHandler *handlerA = GetEventHandler();
- wxEvtHandler *handlerB = handlerA->GetNextHandler();
- handlerA->SetNextHandler((wxEvtHandler *) NULL);
- SetEventHandler(handlerB);
- if (deleteHandler)
+ if (GetEventHandler())
{
- delete handlerA;
- return (wxEvtHandler*) NULL;
- }
- else
- return handlerA;
- }
- else
- return (wxEvtHandler *) NULL;
+ wxEvtHandler *handlerA = GetEventHandler();
+ wxEvtHandler *handlerB = handlerA->GetNextHandler();
+ handlerA->SetNextHandler((wxEvtHandler *) NULL);
+ SetEventHandler(handlerB);
+ if (deleteHandler)
+ {
+ delete handlerA;
+ return (wxEvtHandler*) NULL;
+ }
+ else
+ return handlerA;
+ }
+ else
+ return (wxEvtHandler *) NULL;
}
wxValidator *wxWindow::GetValidator()
{
- return m_windowValidator;
+ return m_windowValidator;
}
void wxWindow::SetValidator( const wxValidator& validator )
m_windowId = id;
}
-wxWindowID wxWindow::GetId()
+wxWindowID wxWindow::GetId() const
{
return m_windowId;
}
if (cursor.Ok())
{
- if (*((wxCursor*)&cursor) == m_cursor) return;
+ if ( cursor == *m_cursor )
+ return;
*m_cursor = cursor;
}
else
void wxWindow::Clear()
{
- wxCHECK_RET( m_widget != NULL, "invalid window" );
+ wxCHECK_RET( m_widget != NULL, "invalid window" );
- if (m_wxwindow && m_wxwindow->window) gdk_window_clear( m_wxwindow->window );
+ if (m_wxwindow && m_wxwindow->window) gdk_window_clear( m_wxwindow->window );
}
wxColour wxWindow::GetBackgroundColour() const
{
- return m_backgroundColour;
+ return m_backgroundColour;
}
void wxWindow::SetBackgroundColour( const wxColour &colour )
{
- wxCHECK_RET( m_widget != NULL, "invalid window" );
+ wxCHECK_RET( m_widget != NULL, "invalid window" );
- m_backgroundColour = colour;
- if (!m_backgroundColour.Ok()) return;
-
- if (m_wxwindow)
- {
- GdkWindow *window = m_wxwindow->window;
- m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) );
- gdk_window_set_background( window, m_backgroundColour.GetColor() );
- gdk_window_clear( window );
- }
-
- ApplyWidgetStyle();
+ if (m_backgroundColour == colour) return;
+
+ if (!m_backgroundColour.Ok())
+ if (wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE ) == colour) return;
+
+ m_backgroundColour = colour;
+ if (!m_backgroundColour.Ok()) return;
+
+ if (m_wxwindow)
+ {
+ GdkWindow *window = m_wxwindow->window;
+ m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) );
+ gdk_window_set_background( window, m_backgroundColour.GetColor() );
+ gdk_window_clear( window );
+ }
+
+ ApplyWidgetStyle();
}
wxColour wxWindow::GetForegroundColour() const
{
- return m_foregroundColour;
+ return m_foregroundColour;
}
void wxWindow::SetForegroundColour( const wxColour &colour )
{
- wxCHECK_RET( m_widget != NULL, "invalid window" );
+ wxCHECK_RET( m_widget != NULL, "invalid window" );
- m_foregroundColour = colour;
- if (!m_foregroundColour.Ok()) return;
-
- ApplyWidgetStyle();
+ if (m_foregroundColour == colour) return;
+
+ m_foregroundColour = colour;
+ if (!m_foregroundColour.Ok()) return;
+
+ ApplyWidgetStyle();
}
GtkStyle *wxWindow::GetWidgetStyle()
{
if (m_widgetStyle) gtk_style_unref( m_widgetStyle );
-
- m_widgetStyle =
- gtk_style_copy(
+
+ m_widgetStyle =
+ gtk_style_copy(
gtk_widget_get_style( m_widget ) );
-
+
return m_widgetStyle;
}
void wxWindow::SetWidgetStyle()
{
GtkStyle *style = GetWidgetStyle();
-
+
gdk_font_unref( style->font );
style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) );
-
+
if (m_foregroundColour.Ok())
{
m_foregroundColour.CalcPixel( gdk_window_get_colormap( m_widget->window ) );
style->fg[GTK_STATE_PRELIGHT] = *m_foregroundColour.GetColor();
style->fg[GTK_STATE_ACTIVE] = *m_foregroundColour.GetColor();
}
-
+
if (m_backgroundColour.Ok())
{
m_backgroundColour.CalcPixel( gdk_window_get_colormap( m_widget->window ) );
{
wxCHECK_MSG( m_widget != NULL, FALSE, "invalid window" );
- wxNode *node = GetChildren()->First();
+ wxNode *node = m_children.First();
while (node)
{
wxWindow *child = (wxWindow *)node->Data();
{
wxCHECK_MSG( m_widget != NULL, FALSE, "invalid window" );
- wxNode *node = GetChildren()->First();
+ wxNode *node = m_children.First();
while (node)
{
wxWindow *child = (wxWindow *)node->Data();
{
wxASSERT_MSG( (m_widget != NULL), "invalid window" );
- wxNode *node = GetChildren()->First();
+ wxNode *node = m_children.First();
while (node)
{
wxWindow *child = (wxWindow *)node->Data();
wxCHECK_MSG( m_widget != NULL, FALSE, "invalid window" );
wxCHECK_MSG( menu != NULL, FALSE, "invalid popup-menu" );
-
+
SetInvokingWindow( menu, this );
gtk_menu_popup(
GTK_MENU(menu->m_menu),
GtkWidget *dnd_widget = GetConnectWidget();
- DisconnectDnDWidget( dnd_widget );
+ if (m_dropTarget) m_dropTarget->UnregisterWidget( dnd_widget );
if (m_dropTarget) delete m_dropTarget;
m_dropTarget = dropTarget;
- ConnectDnDWidget( dnd_widget );
+ if (m_dropTarget) m_dropTarget->RegisterWidget( dnd_widget );
}
wxDropTarget *wxWindow::GetDropTarget() const
return m_dropTarget;
}
-void wxWindow::ConnectDnDWidget( GtkWidget *widget )
-{
- if (!m_dropTarget) return;
-
- m_dropTarget->RegisterWidget( widget );
-
- gtk_signal_connect( GTK_OBJECT(widget), "drop_data_available_event",
- GTK_SIGNAL_FUNC(gtk_window_drop_callback), (gpointer)this );
-}
-
-void wxWindow::DisconnectDnDWidget( GtkWidget *widget )
-{
- if (!m_dropTarget) return;
-
- gtk_signal_disconnect_by_func( GTK_OBJECT(widget),
- GTK_SIGNAL_FUNC(gtk_window_drop_callback), (gpointer)this );
-
- m_dropTarget->UnregisterWidget( widget );
-}
-
GtkWidget* wxWindow::GetConnectWidget()
{
GtkWidget *connect_widget = m_widget;
m_font = font;
else
m_font = *wxSWISS_FONT;
-
- ApplyWidgetStyle();
-}
-wxFont *wxWindow::GetFont()
-{
- return &m_font;
+ ApplyWidgetStyle();
}
void wxWindow::SetWindowStyleFlag( long flag )
if (!m_wxwindow) return;
+ m_hasScrolling = TRUE;
+
if (orient == wxHORIZONTAL)
{
float fpos = (float)pos;
int d_y = 0;
if (dx > 0) d_x = dx;
if (dy > 0) d_y = dy;
-
+
if (!m_scrollGC)
{
m_scrollGC = gdk_gc_new( m_wxwindow->window );
gdk_gc_set_exposures( m_scrollGC, TRUE );
}
-
+
gdk_window_copy_area( m_wxwindow->window, m_scrollGC, d_x, d_y,
m_wxwindow->window, s_x, s_y, w, h );
{
noChanges = 0;
noFailures = 0;
- wxNode *node = GetChildren()->First();
+ wxNode *node = m_children.First();
while (node)
{
wxWindow *child = (wxWindow *)node->Data();
constr->centreX.SetDone(FALSE);
constr->centreY.SetDone(FALSE);
}
- wxNode *node = GetChildren()->First();
+ wxNode *node = m_children.First();
while (node)
{
wxWindow *win = (wxWindow *)node->Data();
if (recurse)
{
- wxNode *node = GetChildren()->First();
+ wxNode *node = m_children.First();
while (node)
{
wxWindow *win = (wxWindow *)node->Data();
projects / wxWidgets.git / blobdiff