X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a5a83677555023d476401bab5809a1107222c74..520e470fdd0daef09c77938db642e4583933c90d:/src/gtk/window.cpp diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 097bd145e8..a76a068ebd 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -25,14 +25,89 @@ #include "wx/dcclient.h" #include "wx/dnd.h" #include "wx/mdi.h" +#include "wx/menu.h" #include "wx/notebook.h" #include "wx/statusbr.h" -#include -//#include "wx/treectrl.h" -#include "gdk/gdkkeysyms.h" -#include +#include "wx/intl.h" #include "wx/gtk/win_gtk.h" #include "gdk/gdkprivate.h" +#include "gdk/gdkkeysyms.h" + +#include + +//----------------------------------------------------------------------------- +// documentation on internals +//----------------------------------------------------------------------------- + +/* + I have been asked several times about writing some documentation about + the GTK port of wxWindows, especially its internal structures. Obviously, + you cannot understand wxGTK without knowing a little about the GTK, but + some more information about what the wxWindow, which is the base class + for all other window classes, does seems required as well. + + What does wxWindow do? It contains the common interface for the following + jobs of its descentants: + + 1) Define the rudimentary behaviour common to all window classes, such as + resizing, intercepting user input so as to make it possible to use these + events for special purposes in a derived class, window names etc. + + 2) Provide the possibility to contain and manage children, if the derived + class is allowed to contain children, which holds true for those window + classes, which do not display a native GTK widget. To name them, these + classes are wxPanel, wxScrolledWindow, wxDialog, wxFrame. The MDI frame- + work classes are a special case and are handled a bit differently from + the rest. + + 3) Provide the possibility to draw into a client area of a window. This, + too, only holds true for classes that do not display a native GTK widget + as above. + + 4) Provide the entire mechanism for scrolling widgets. This actaul inter- + face for this is usually in wxScrolledWidget, but the GTK implementation + is in this class. + + 5) A multitude of helper or extra methods for special purposes, such as + Drag'n'Drop, managing validators etc. + + Normally one might expect, that one wxWindows class would always contain + one GTK widget. Under GTK, there is no such allround widget that has all + the functionality. Moreover, the GTK defines a client area as a different + widget from the actual widget you are handling. Last but not least some + special classes (e.g. wxFrame) handle different categories of widgets and + still have the possibility to draw something in the client area. + It was therefore required to write a special purpose GTK widget, that would + represent a client area in the sense of wxWindows capable to do the jobs + 2), 3) and 4). I have written this class and it resides in win_gtk.c of + this directory. + + All windows must have a widget, with which they interact with other under- + lying GTK widget. It is this widget, e.g. that has to be resized etc and + thw wxWindow class has a member variable called m_widget which holds a + pointer to this widget. When the window class displays a GTK native widget, + this is the only GTK widget the class manages. When the class has a client + area for drawing into and for containing children it must have at least + one more GTK widget to handle (of the type GtkMyFixed, defined in win_gtk.c), + but there can be any number of widgets, handled by a class (e.g. the frame + class handles three). 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 + one widget, so in the case of e.g. the wxButton class m_widget holds a + pointer to a GtkButton widget. But windows with client areas (for drawing + and children) have a m_widget field that is a pointer to a GtkScrolled- + Window and a m_wxwindow field that is pointer to a GtkMyFixed and this + one is (in the GTK sense) a child of the GtkScrolledWindow. + + If the m_wxwindow field is set, then all input to this widget is inter- + cepted and sent to the wxWindows class. If not, all input to the widget + that gets pointed to by m_widget gets intercepted and sent to the class. + +*/ //----------------------------------------------------------------------------- // data @@ -41,123 +116,66 @@ extern wxList wxPendingDelete; extern wxList wxTopLevelWindows; extern bool g_blockEventsOnDrag; +static bool g_capturing = FALSE; -//----------------------------------------------------------------------------- -// GTK callbacks for wxWindows event system -//----------------------------------------------------------------------------- +// hack: we need something to pass to gtk_menu_popup, so we store the time of +// the last click here +static guint32 gs_timeLastClick = 0; //----------------------------------------------------------------------------- -// expose (of m_wxwindow, not of m_widget) +// "expose_event" (of m_wxwindow, not of m_widget) +//----------------------------------------------------------------------------- -void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_event, wxWindow *win ) -{ +static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_event, wxWindow *win ) +{ if (!win->HasVMT()) return; if (g_blockEventsOnDrag) return; - -/* - if (IS_KIND_OF(win,wxTreeCtrl)) - { - printf( "OnExpose from " ); - if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) - printf( win->GetClassInfo()->GetClassName() ); - printf( ".\n" ); - - printf( "x: %d \n", gdk_event->area.x ); - printf( "y: %d \n", gdk_event->area.y ); - printf( "w: %d \n", gdk_event->area.width ); - printf( "h: %d \n", gdk_event->area.height ); -} -*/ win->m_updateRegion.Union( gdk_event->area.x, gdk_event->area.y, - gdk_event->area.width, - gdk_event->area.height ); - - if (gdk_event->count > 0) return; + gdk_event->area.width, + gdk_event->area.height ); - wxPaintEvent event( win->GetId() ); - event.SetEventObject( win ); - win->ProcessEvent( event ); - - win->m_updateRegion.Clear(); -}; - -//----------------------------------------------------------------------------- -// draw (of m_wxwindow, not of m_widget) + if (gdk_event->count > 0) return; -void gtk_window_draw_callback( GtkWidget *WXUNUSED(widget), GdkRectangle *rect, wxWindow *win ) -{ - if (!win->HasVMT()) return; - if (g_blockEventsOnDrag) return; - /* - printf( "OnDraw from " ); + printf( "OnExpose from " ); if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) printf( win->GetClassInfo()->GetClassName() ); printf( ".\n" ); - - printf( "x: %d \n", rect->x ); - printf( "y: %d \n", rect->y ); - printf( "w: %d \n", rect->width ); - printf( "h: %d \n", rect->height ); */ - win->m_updateRegion.Union( rect->x, rect->y, rect->width, rect->height ); - wxPaintEvent event( win->GetId() ); event.SetEventObject( win ); - win->ProcessEvent( event ); - + win->GetEventHandler()->ProcessEvent( event ); + win->m_updateRegion.Clear(); -}; +} //----------------------------------------------------------------------------- -// size -// I don't any longer intercept GTK's internal resize events, except -// for frames and from within MDI and tabbed windows (client area -// size determined internally by GTK, not wxWin). +// "draw" (of m_wxwindow, not of m_widget) +//----------------------------------------------------------------------------- -/* -void gtk_window_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win ) -{ +static void gtk_window_draw_callback( GtkWidget *WXUNUSED(widget), GdkRectangle *rect, wxWindow *win ) +{ if (!win->HasVMT()) return; if (g_blockEventsOnDrag) return; - - return; - if ((win->m_x == alloc->x) && - (win->m_y == alloc->y) && - (win->m_width == alloc->width) && - (win->m_height == alloc->height)) - { - return; - }; - - printf( "OnResize from " ); - if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) - printf( win->GetClassInfo()->GetClassName() ); - printf( " .\n" ); - - printf( " Old: X: %d Y: %d ", win->m_x, win->m_y ); - printf( " W: %d H: %d ", win->m_width, win->m_height ); - printf( " .\n" ); - - printf( " New: X: %d Y: %d ", alloc->x, alloc->y ); - printf( " W: %d H: %d ", alloc->width, alloc->height ); - printf( " .\n" ); - - wxSizeEvent event( wxSize( alloc->width, alloc->height), win->GetId() ); + win->m_updateRegion.Union( rect->x, rect->y, rect->width, rect->height ); + + wxPaintEvent event( win->GetId() ); event.SetEventObject( win ); - win->ProcessEvent( event ); -}; -*/ + win->GetEventHandler()->ProcessEvent( event ); + win->m_updateRegion.Clear(); +} + +//----------------------------------------------------------------------------- +// "key_press_event" //----------------------------------------------------------------------------- -// key_press -gint gtk_window_key_press_callback( GtkWidget *WXUNUSED(widget), GdkEventKey *gdk_event, wxWindow *win ) -{ +static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxWindow *win ) +{ if (!win->HasVMT()) return FALSE; if (g_blockEventsOnDrag) return FALSE; @@ -171,83 +189,83 @@ gint gtk_window_key_press_callback( GtkWidget *WXUNUSED(widget), GdkEventKey *gd long key_code = 0; switch (gdk_event->keyval) { - case GDK_BackSpace: key_code = WXK_BACK; break; - case GDK_Tab: key_code = WXK_TAB; break; - case GDK_Linefeed: key_code = WXK_RETURN; break; - case GDK_Clear: key_code = WXK_CLEAR; break; - case GDK_Return: key_code = WXK_RETURN; break; - case GDK_Pause: key_code = WXK_PAUSE; break; - case GDK_Scroll_Lock: key_code = WXK_SCROLL; break; - case GDK_Escape: key_code = WXK_ESCAPE; break; - case GDK_Delete: key_code = WXK_DELETE; break; - case GDK_Home: key_code = WXK_HOME; break; - case GDK_Left: key_code = WXK_LEFT; break; - case GDK_Up: key_code = WXK_UP; break; - case GDK_Right: key_code = WXK_RIGHT; break; - case GDK_Down: key_code = WXK_DOWN; break; - case GDK_Prior: key_code = WXK_PRIOR; break; -// case GDK_Page_Up: key_code = WXK_PAGEUP; break; - case GDK_Next: key_code = WXK_NEXT; break; -// case GDK_Page_Down: key_code = WXK_PAGEDOWN; break; - case GDK_End: key_code = WXK_END; break; - case GDK_Begin: key_code = WXK_HOME; break; - case GDK_Select: key_code = WXK_SELECT; break; - case GDK_Print: key_code = WXK_PRINT; break; - case GDK_Execute: key_code = WXK_EXECUTE; break; - case GDK_Insert: key_code = WXK_INSERT; break; - case GDK_Num_Lock: key_code = WXK_NUMLOCK; break; - case GDK_KP_Tab: key_code = WXK_TAB; break; - case GDK_KP_Enter: key_code = WXK_RETURN; break; - case GDK_KP_Home: key_code = WXK_HOME; break; - case GDK_KP_Left: key_code = WXK_LEFT; break; - case GDK_KP_Up: key_code = WXK_UP; break; - case GDK_KP_Right: key_code = WXK_RIGHT; break; - case GDK_KP_Down: key_code = WXK_DOWN; break; - case GDK_KP_Prior: key_code = WXK_PRIOR; break; -// case GDK_KP_Page_Up: key_code = WXK_PAGEUP; break; - case GDK_KP_Next: key_code = WXK_NEXT; break; -// case GDK_KP_Page_Down: key_code = WXK_PAGEDOWN; break; - case GDK_KP_End: key_code = WXK_END; break; - case GDK_KP_Begin: key_code = WXK_HOME; break; - case GDK_KP_Insert: key_code = WXK_INSERT; break; - case GDK_KP_Delete: key_code = WXK_DELETE; break; - case GDK_KP_Multiply: key_code = WXK_MULTIPLY; break; - case GDK_KP_Add: key_code = WXK_ADD; break; - case GDK_KP_Separator: key_code = WXK_SEPARATOR; break; - case GDK_KP_Subtract: key_code = WXK_SUBTRACT; break; - case GDK_KP_Decimal: key_code = WXK_DECIMAL; break; - case GDK_KP_Divide: key_code = WXK_DIVIDE; break; - case GDK_KP_0: key_code = WXK_NUMPAD0; break; - case GDK_KP_1: key_code = WXK_NUMPAD1; break; - case GDK_KP_2: key_code = WXK_NUMPAD2; break; - case GDK_KP_3: key_code = WXK_NUMPAD3; break; - case GDK_KP_4: key_code = WXK_NUMPAD4; break; - case GDK_KP_5: key_code = WXK_NUMPAD5; break; - case GDK_KP_6: key_code = WXK_NUMPAD6; break; - case GDK_KP_7: key_code = WXK_NUMPAD7; break; - case GDK_KP_8: key_code = WXK_NUMPAD7; break; - case GDK_KP_9: key_code = WXK_NUMPAD9; break; - case GDK_F1: key_code = WXK_F1; break; - case GDK_F2: key_code = WXK_F2; break; - case GDK_F3: key_code = WXK_F3; break; - case GDK_F4: key_code = WXK_F4; break; - case GDK_F5: key_code = WXK_F5; break; - case GDK_F6: key_code = WXK_F6; break; - case GDK_F7: key_code = WXK_F7; break; - case GDK_F8: key_code = WXK_F8; break; - case GDK_F9: key_code = WXK_F9; break; - case GDK_F10: key_code = WXK_F10; break; - case GDK_F11: key_code = WXK_F11; break; - case GDK_F12: key_code = WXK_F12; break; + case GDK_BackSpace: key_code = WXK_BACK; break; + case GDK_Tab: key_code = WXK_TAB; break; + case GDK_Linefeed: key_code = WXK_RETURN; break; + case GDK_Clear: key_code = WXK_CLEAR; break; + case GDK_Return: key_code = WXK_RETURN; break; + case GDK_Pause: key_code = WXK_PAUSE; break; + case GDK_Scroll_Lock: key_code = WXK_SCROLL; break; + case GDK_Escape: key_code = WXK_ESCAPE; break; + case GDK_Delete: key_code = WXK_DELETE; break; + case GDK_Home: key_code = WXK_HOME; break; + case GDK_Left: key_code = WXK_LEFT; break; + case GDK_Up: key_code = WXK_UP; break; + case GDK_Right: key_code = WXK_RIGHT; break; + case GDK_Down: key_code = WXK_DOWN; break; + case GDK_Prior: key_code = WXK_PRIOR; break; +// case GDK_Page_Up: key_code = WXK_PAGEUP; break; + case GDK_Next: key_code = WXK_NEXT; break; +// case GDK_Page_Down: key_code = WXK_PAGEDOWN; break; + case GDK_End: key_code = WXK_END; break; + case GDK_Begin: key_code = WXK_HOME; break; + case GDK_Select: key_code = WXK_SELECT; break; + case GDK_Print: key_code = WXK_PRINT; break; + case GDK_Execute: key_code = WXK_EXECUTE; break; + case GDK_Insert: key_code = WXK_INSERT; break; + case GDK_Num_Lock: key_code = WXK_NUMLOCK; break; + case GDK_KP_Tab: key_code = WXK_TAB; break; + case GDK_KP_Enter: key_code = WXK_RETURN; break; + case GDK_KP_Home: key_code = WXK_HOME; break; + case GDK_KP_Left: key_code = WXK_LEFT; break; + case GDK_KP_Up: key_code = WXK_UP; break; + case GDK_KP_Right: key_code = WXK_RIGHT; break; + case GDK_KP_Down: key_code = WXK_DOWN; break; + case GDK_KP_Prior: key_code = WXK_PRIOR; break; +// case GDK_KP_Page_Up: key_code = WXK_PAGEUP; break; + case GDK_KP_Next: key_code = WXK_NEXT; break; +// case GDK_KP_Page_Down: key_code = WXK_PAGEDOWN; break; + case GDK_KP_End: key_code = WXK_END; break; + case GDK_KP_Begin: key_code = WXK_HOME; break; + case GDK_KP_Insert: key_code = WXK_INSERT; break; + case GDK_KP_Delete: key_code = WXK_DELETE; break; + case GDK_KP_Multiply: key_code = WXK_MULTIPLY; break; + case GDK_KP_Add: key_code = WXK_ADD; break; + case GDK_KP_Separator: key_code = WXK_SEPARATOR; break; + case GDK_KP_Subtract: key_code = WXK_SUBTRACT; break; + case GDK_KP_Decimal: key_code = WXK_DECIMAL; break; + case GDK_KP_Divide: key_code = WXK_DIVIDE; break; + case GDK_KP_0: key_code = WXK_NUMPAD0; break; + case GDK_KP_1: key_code = WXK_NUMPAD1; break; + case GDK_KP_2: key_code = WXK_NUMPAD2; break; + case GDK_KP_3: key_code = WXK_NUMPAD3; break; + case GDK_KP_4: key_code = WXK_NUMPAD4; break; + case GDK_KP_5: key_code = WXK_NUMPAD5; break; + case GDK_KP_6: key_code = WXK_NUMPAD6; break; + case GDK_KP_7: key_code = WXK_NUMPAD7; break; + case GDK_KP_8: key_code = WXK_NUMPAD7; break; + case GDK_KP_9: key_code = WXK_NUMPAD9; break; + case GDK_F1: key_code = WXK_F1; break; + case GDK_F2: key_code = WXK_F2; break; + case GDK_F3: key_code = WXK_F3; break; + case GDK_F4: key_code = WXK_F4; break; + case GDK_F5: key_code = WXK_F5; break; + case GDK_F6: key_code = WXK_F6; break; + case GDK_F7: key_code = WXK_F7; break; + case GDK_F8: key_code = WXK_F8; break; + case GDK_F9: key_code = WXK_F9; break; + case GDK_F10: key_code = WXK_F10; break; + case GDK_F11: key_code = WXK_F11; break; + case GDK_F12: key_code = WXK_F12; break; default: { - if ((gdk_event->keyval >= 0x20) && (gdk_event->keyval <= 0xFF)) + if ((gdk_event->keyval >= 0x20) && (gdk_event->keyval <= 0xFF)) key_code = gdk_event->keyval; - }; - }; + } + } if (!key_code) return FALSE; - + wxKeyEvent event( wxEVT_CHAR ); event.m_shiftDown = (gdk_event->state & GDK_SHIFT_MASK); event.m_controlDown = (gdk_event->state & GDK_CONTROL_MASK); @@ -257,20 +275,42 @@ gint gtk_window_key_press_callback( GtkWidget *WXUNUSED(widget), GdkEventKey *gd event.m_x = 0; event.m_y = 0; event.SetEventObject( win ); - - bool ret = win->ProcessEvent( event ); -/* - if (ret) printf( "found.\n") ; -*/ + + bool ret = win->GetEventHandler()->ProcessEvent( event ); + + if (!ret) + { + wxWindow *ancestor = win; + while (ancestor) + { + int command = ancestor->GetAcceleratorTable()->GetCommand( event ); + if (command != -1) + { + wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command ); + ret = ancestor->GetEventHandler()->ProcessEvent( command_event ); + break; + } + ancestor = ancestor->GetParent(); + } + } + + if (ret) + { + if ((gdk_event->keyval >= 0x20) && (gdk_event->keyval <= 0xFF)) + gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" ); + } + return ret; -}; +} //----------------------------------------------------------------------------- -// button_press +// "button_press_event" +//----------------------------------------------------------------------------- + +static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxWindow *win ) +{ + if (!win->IsOwnGtkWindow( gdk_event->window )) return TRUE; -gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxWindow *win ) -{ - if (widget->window != gdk_event->window) return TRUE; if (g_blockEventsOnDrag) return TRUE; if (win->m_wxwindow) @@ -278,28 +318,28 @@ gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_ev if (GTK_WIDGET_CAN_FOCUS(win->m_wxwindow) && !GTK_WIDGET_HAS_FOCUS (win->m_wxwindow) ) { gtk_widget_grab_focus (win->m_wxwindow); - + /* printf( "GrabFocus from " ); if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) printf( win->GetClassInfo()->GetClassName() ); printf( ".\n" ); */ - - }; - }; - + + } + } + if (!win->HasVMT()) return TRUE; - + /* printf( "OnButtonPress from " ); if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) printf( win->GetClassInfo()->GetClassName() ); printf( ".\n" ); */ - + wxEventType event_type = wxEVT_LEFT_DOWN; - + if (gdk_event->button == 1) { switch (gdk_event->type) @@ -307,7 +347,7 @@ gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_ev case GDK_BUTTON_PRESS: event_type = wxEVT_LEFT_DOWN; break; case GDK_2BUTTON_PRESS: event_type = wxEVT_LEFT_DCLICK; break; default: break; - }; + } } else if (gdk_event->button == 2) { @@ -316,7 +356,7 @@ gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_ev case GDK_BUTTON_PRESS: event_type = wxEVT_MIDDLE_DOWN; break; case GDK_2BUTTON_PRESS: event_type = wxEVT_MIDDLE_DCLICK; break; default: break; - }; + } } else if (gdk_event->button == 3) { @@ -325,9 +365,9 @@ gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_ev case GDK_BUTTON_PRESS: event_type = wxEVT_RIGHT_DOWN; break; case GDK_2BUTTON_PRESS: event_type = wxEVT_RIGHT_DCLICK; break; default: break; - }; - }; - + } + } + wxMouseEvent event( event_type ); event.m_shiftDown = (gdk_event->state & GDK_SHIFT_MASK); event.m_controlDown = (gdk_event->state & GDK_CONTROL_MASK); @@ -336,42 +376,70 @@ gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_ev event.m_leftDown = (gdk_event->state & GDK_BUTTON1_MASK); event.m_middleDown = (gdk_event->state & GDK_BUTTON2_MASK); event.m_rightDown = (gdk_event->state & GDK_BUTTON3_MASK); - + event.m_x = (long)gdk_event->x; event.m_y = (long)gdk_event->y; + + // Some control don't have their own X window and thus cannot get + // any events. + + if (!g_capturing) + { + wxNode *node = win->GetChildren()->First(); + while (node) + { + wxWindow *child = (wxWindow*)node->Data(); + if ((child->m_x <= event.m_x) && + (child->m_y <= event.m_y) && + (child->m_x+child->m_width >= event.m_x) && + (child->m_y+child->m_height >= event.m_y)) + { + win = child; + event.m_x -= child->m_x; + event.m_y -= child->m_y; + break; + } + node = node->Next(); + } + } + event.SetEventObject( win ); - - win->ProcessEvent( event ); - + + gs_timeLastClick = gdk_event->time; + + if (win->GetEventHandler()->ProcessEvent( event )) + gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "button_press_event" ); + return TRUE; -}; +} //----------------------------------------------------------------------------- -// button_release +// "button_release_event" +//----------------------------------------------------------------------------- -gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxWindow *win ) -{ - if (widget->window != gdk_event->window) return TRUE; +static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxWindow *win ) +{ + if (!win->IsOwnGtkWindow( gdk_event->window )) return TRUE; if (g_blockEventsOnDrag) return TRUE; if (!win->HasVMT()) return TRUE; - + /* printf( "OnButtonRelease from " ); if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) printf( win->GetClassInfo()->GetClassName() ); printf( ".\n" ); */ - + wxEventType event_type = wxEVT_NULL; - + switch (gdk_event->button) { case 1: event_type = wxEVT_LEFT_UP; break; case 2: event_type = wxEVT_MIDDLE_UP; break; case 3: event_type = wxEVT_RIGHT_UP; break; - }; + } wxMouseEvent event( event_type ); event.m_shiftDown = (gdk_event->state & GDK_SHIFT_MASK); @@ -383,31 +451,57 @@ gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_ event.m_rightDown = (gdk_event->state & GDK_BUTTON3_MASK); event.m_x = (long)gdk_event->x; event.m_y = (long)gdk_event->y; + + // Some control don't have their own X window and thus cannot get + // any events. + + if (!g_capturing) + { + wxNode *node = win->GetChildren()->First(); + while (node) + { + wxWindow *child = (wxWindow*)node->Data(); + if ((child->m_x <= event.m_x) && + (child->m_y <= event.m_y) && + (child->m_x+child->m_width >= event.m_x) && + (child->m_y+child->m_height >= event.m_y)) + { + win = child; + event.m_x -= child->m_x; + event.m_y -= child->m_y; + break; + } + node = node->Next(); + } + } + event.SetEventObject( win ); - - win->ProcessEvent( event ); - + + if (win->GetEventHandler()->ProcessEvent( event )) + gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "button_release_event" ); + return TRUE; -}; +} //----------------------------------------------------------------------------- -// motion_notify +// "motion_notify_event" +//----------------------------------------------------------------------------- -gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxWindow *win ) -{ - if (widget->window != gdk_event->window) return TRUE; +static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxWindow *win ) +{ + if (!win->IsOwnGtkWindow( gdk_event->window )) return TRUE; if (g_blockEventsOnDrag) return TRUE; if (!win->HasVMT()) return TRUE; - + /* printf( "OnMotion from " ); if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) printf( win->GetClassInfo()->GetClassName() ); printf( ".\n" ); */ - + wxMouseEvent event( wxEVT_MOTION ); event.m_shiftDown = (gdk_event->state & GDK_SHIFT_MASK); event.m_controlDown = (gdk_event->state & GDK_CONTROL_MASK); @@ -416,20 +510,46 @@ gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_e event.m_leftDown = (gdk_event->state & GDK_BUTTON1_MASK); event.m_middleDown = (gdk_event->state & GDK_BUTTON2_MASK); event.m_rightDown = (gdk_event->state & GDK_BUTTON3_MASK); - + event.m_x = (long)gdk_event->x; event.m_y = (long)gdk_event->y; + + // Some control don't have their own X window and thus cannot get + // any events. + + if (!g_capturing) + { + wxNode *node = win->GetChildren()->First(); + while (node) + { + wxWindow *child = (wxWindow*)node->Data(); + if ((child->m_x <= event.m_x) && + (child->m_y <= event.m_y) && + (child->m_x+child->m_width >= event.m_x) && + (child->m_y+child->m_height >= event.m_y)) + { + win = child; + event.m_x -= child->m_x; + event.m_y -= child->m_y; + break; + } + node = node->Next(); + } + } + event.SetEventObject( win ); - - win->ProcessEvent( event ); - + + if (win->GetEventHandler()->ProcessEvent( event )) + gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "motion_notify_event" ); + return TRUE; -}; +} //----------------------------------------------------------------------------- -// focus_in +// "focus_in_event" +//----------------------------------------------------------------------------- -gint gtk_window_focus_in_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxWindow *win ) +static gint gtk_window_focus_in_callback( GtkWidget *widget, GdkEvent *WXUNUSED(event), wxWindow *win ) { if (g_blockEventsOnDrag) return TRUE; if (win->m_wxwindow) @@ -437,17 +557,17 @@ gint gtk_window_focus_in_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUS if (GTK_WIDGET_CAN_FOCUS(win->m_wxwindow)) { GTK_WIDGET_SET_FLAGS (win->m_wxwindow, GTK_HAS_FOCUS); -/* +/* printf( "SetFocus flag from " ); if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) printf( win->GetClassInfo()->GetClassName() ); printf( ".\n" ); */ - }; - }; - + } + } + if (!win->HasVMT()) return TRUE; - + /* printf( "OnSetFocus from " ); if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) @@ -456,46 +576,114 @@ gint gtk_window_focus_in_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUS printf( WXSTRINGCAST win->GetLabel() ); printf( ".\n" ); */ - + wxFocusEvent event( wxEVT_SET_FOCUS, win->GetId() ); event.SetEventObject( win ); - win->ProcessEvent( event ); - + + if (win->GetEventHandler()->ProcessEvent( event )) + gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "focus_in_event" ); + return TRUE; -}; +} //----------------------------------------------------------------------------- -// focus out +// "focus_out_event" +//----------------------------------------------------------------------------- -gint gtk_window_focus_out_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxWindow *win ) +static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED(event), wxWindow *win ) { if (g_blockEventsOnDrag) return TRUE; if (win->m_wxwindow) { if (GTK_WIDGET_CAN_FOCUS(win->m_wxwindow)) GTK_WIDGET_UNSET_FLAGS (win->m_wxwindow, GTK_HAS_FOCUS); - }; - + } + if (!win->HasVMT()) return TRUE; - + /* printf( "OnKillFocus from " ); if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) printf( win->GetClassInfo()->GetClassName() ); printf( ".\n" ); */ - + wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() ); event.SetEventObject( win ); - win->ProcessEvent( event ); - + + if (win->GetEventHandler()->ProcessEvent( event )) + gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "focus_out_event" ); + return TRUE; -}; +} //----------------------------------------------------------------------------- -// vertical scroll +// "enter_notify_event" +//----------------------------------------------------------------------------- -void gtk_window_vscroll_callback( GtkWidget *WXUNUSED(widget), wxWindow *win ) +static gint gtk_window_enter_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxWindow *win ) +{ + if (widget->window != gdk_event->window) return TRUE; + + if (g_blockEventsOnDrag) return TRUE; + + if (!win->HasVMT()) return TRUE; + +/* + printf( "OnEnter from " ); + if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) + printf( win->GetClassInfo()->GetClassName() ); + printf( ".\n" ); +*/ + + if ((widget->window) && (win->m_cursor)) + gdk_window_set_cursor( widget->window, win->m_cursor->GetCursor() ); + + wxMouseEvent event( wxEVT_ENTER_WINDOW ); + event.SetEventObject( win ); + + if (win->GetEventHandler()->ProcessEvent( event )) + gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "enter_notify_event" ); + + return TRUE; +} + +//----------------------------------------------------------------------------- +// "leave_notify_event" +//----------------------------------------------------------------------------- + +static gint gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxWindow *win ) +{ + if (widget->window != gdk_event->window) return TRUE; + + if (g_blockEventsOnDrag) return TRUE; + + if (!win->HasVMT()) return TRUE; + +/* + printf( "OnLeave from " ); + if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) + printf( win->GetClassInfo()->GetClassName() ); + printf( ".\n" ); +*/ + + if ((widget->window) && (win->m_cursor)) + gdk_window_set_cursor( widget->window, wxSTANDARD_CURSOR->GetCursor() ); + + wxMouseEvent event( wxEVT_LEAVE_WINDOW ); + event.SetEventObject( win ); + + if (win->GetEventHandler()->ProcessEvent( event )) + gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "leave_notify_event" ); + + return TRUE; +} + +//----------------------------------------------------------------------------- +// "value_changed" from m_vAdjust +//----------------------------------------------------------------------------- + +static void gtk_window_vscroll_callback( GtkWidget *WXUNUSED(widget), wxWindow *win ) { if (g_blockEventsOnDrag) return; @@ -505,68 +693,55 @@ void gtk_window_vscroll_callback( GtkWidget *WXUNUSED(widget), wxWindow *win ) printf( win->GetClassInfo()->GetClassName() ); printf( ".\n" ); */ - + if (!win->HasVMT()) return; - + float diff = win->m_vAdjust->value - win->m_oldVerticalPos; if (fabs(diff) < 0.2) return; - -/* - int i = (int)(win->m_oldVerticalPos+0.5); - printf( "Old value: %d.\n", i ); - i = (int)(win->m_vAdjust->value+0.5); - printf( "Sending new value: %d.\n", i ); -*/ wxEventType command = wxEVT_NULL; - + 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; - + int value = (int)(win->m_vAdjust->value+0.5); wxScrollEvent event( command, win->GetId(), value, wxVERTICAL ); event.SetEventObject( win ); - win->ProcessEvent( event ); -}; + win->GetEventHandler()->ProcessEvent( event ); +} //----------------------------------------------------------------------------- -// horizontal scroll +// "value_changed" from m_hAdjust +//----------------------------------------------------------------------------- -void gtk_window_hscroll_callback( GtkWidget *WXUNUSED(widget), wxWindow *win ) -{ +static void gtk_window_hscroll_callback( GtkWidget *WXUNUSED(widget), wxWindow *win ) +{ if (g_blockEventsOnDrag) return; - + /* printf( "OnHScroll from " ); if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) printf( win->GetClassInfo()->GetClassName() ); printf( ".\n" ); */ - + if (!win->HasVMT()) return; - + float diff = win->m_hAdjust->value - win->m_oldHorizontalPos; if (fabs(diff) < 0.2) return; - -/* - int i = (int)(win->m_oldHorizontalPos+0.5); - printf( "Old value: %d.\n", i ); - i = (int)(win->m_hAdjust->value+0.5); - printf( "Sending new value: %d.\n", i ); -*/ - + wxEventType command = wxEVT_NULL; - + 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; @@ -574,16 +749,17 @@ void gtk_window_hscroll_callback( GtkWidget *WXUNUSED(widget), wxWindow *win ) else command = wxEVT_SCROLL_THUMBTRACK; int value = (int)(win->m_hAdjust->value+0.5); - + wxScrollEvent event( command, win->GetId(), value, wxHORIZONTAL ); event.SetEventObject( win ); - win->ProcessEvent( event ); -}; + win->GetEventHandler()->ProcessEvent( event ); +} //----------------------------------------------------------------------------- -// vertical scroll change +// "changed" from m_vAdjust +//----------------------------------------------------------------------------- -void gtk_window_vscroll_change_callback( GtkWidget *WXUNUSED(widget), wxWindow *win ) +static void gtk_window_vscroll_change_callback( GtkWidget *WXUNUSED(widget), wxWindow *win ) { if (g_blockEventsOnDrag) return; @@ -593,56 +769,91 @@ void gtk_window_vscroll_change_callback( GtkWidget *WXUNUSED(widget), wxWindow * printf( win->GetClassInfo()->GetClassName() ); printf( ".\n" ); */ - + if (!win->HasVMT()) return; - + wxEventType command = wxEVT_SCROLL_THUMBTRACK; int value = (int)(win->m_vAdjust->value+0.5); wxScrollEvent event( command, win->GetId(), value, wxVERTICAL ); event.SetEventObject( win ); - win->ProcessEvent( event ); -}; + win->GetEventHandler()->ProcessEvent( event ); +} //----------------------------------------------------------------------------- -// horizontal scroll change +// "changed" from m_hAdjust +//----------------------------------------------------------------------------- -void gtk_window_hscroll_change_callback( GtkWidget *WXUNUSED(widget), wxWindow *win ) -{ +static void gtk_window_hscroll_change_callback( GtkWidget *WXUNUSED(widget), wxWindow *win ) +{ if (g_blockEventsOnDrag) return; - + /* printf( "OnHScroll change from " ); if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) printf( win->GetClassInfo()->GetClassName() ); printf( ".\n" ); */ - + if (!win->HasVMT()) return; - + wxEventType command = wxEVT_SCROLL_THUMBTRACK; int value = (int)(win->m_hAdjust->value+0.5); - + wxScrollEvent event( command, win->GetId(), value, wxHORIZONTAL ); event.SetEventObject( win ); - win->ProcessEvent( event ); -}; + win->GetEventHandler()->ProcessEvent( event ); +} + +//----------------------------------------------------------------------------- +// "button_press_event" from scrollbar +//----------------------------------------------------------------------------- + +static gint gtk_scrollbar_button_press_callback( GtkRange *widget, GdkEventButton *gdk_event, wxWindow *win ) +{ + if (gdk_event->window != widget->slider) return FALSE; + + win->m_isScrolling = TRUE; + + return FALSE; +} //----------------------------------------------------------------------------- -// drop +// "button_release_event" from scrollbar +//----------------------------------------------------------------------------- -void gtk_window_drop_callback( GtkWidget *widget, GdkEvent *event, wxWindow *win ) +static gint gtk_scrollbar_button_release_callback( GtkRange *widget, GdkEventButton *gdk_event, wxWindow *win ) +{ + if (gdk_event->window != widget->slider) return FALSE; + + GtkScrolledWindow *s_window = GTK_SCROLLED_WINDOW(win->m_widget); + + if (widget == GTK_RANGE(s_window->vscrollbar)) + gtk_signal_emit_by_name( GTK_OBJECT(win->m_hAdjust), "value_changed" ); + else + gtk_signal_emit_by_name( GTK_OBJECT(win->m_vAdjust), "value_changed" ); + + win->m_isScrolling = FALSE; + + return FALSE; +} + +//----------------------------------------------------------------------------- +// "drop_data_available_event" +//----------------------------------------------------------------------------- + +static void gtk_window_drop_callback( GtkWidget *widget, GdkEvent *event, wxWindow *win ) { if (!win->HasVMT()) return; - + if (win->GetDropTarget()) { int x = 0; int y = 0; - gdk_window_get_pointer( widget->window, &x, &y, NULL ); + gdk_window_get_pointer( widget->window, &x, &y, (GdkModifierType *) NULL ); win->GetDropTarget()->Drop( event, x, y ); - }; - + } + /* g_free (event->dropdataavailable.data); g_free (event->dropdataavailable.data_type); @@ -650,56 +861,7 @@ void gtk_window_drop_callback( GtkWidget *widget, GdkEvent *event, wxWindow *win } //----------------------------------------------------------------------------- -// destroy - -bool gtk_window_destroy_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxWindow *win ) -{ - printf( "OnDestroy from " ); - if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) - printf( win->GetClassInfo()->GetClassName() ); - printf( ".\n" ); - printf( "Goodbye.\n" ); - printf( " Robert Roebling.\n" ); - - return FALSE; -}; - -//----------------------------------------------------------------------------- -// enter - -bool gtk_window_enter_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxWindow *win ) -{ - if (widget->window != gdk_event->window) return TRUE; - if (g_blockEventsOnDrag) return TRUE; - if (!win->HasVMT()) return TRUE; - - if (widget->window) - gdk_window_set_cursor( widget->window, win->m_cursor->GetCursor() ); - - wxMouseEvent event( wxEVT_ENTER_WINDOW ); - event.SetEventObject( win ); - return win->ProcessEvent( event ); -}; - -//----------------------------------------------------------------------------- -// leave - -bool gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxWindow *win ) -{ - if (widget->window != gdk_event->window) return TRUE; - if (!win->HasVMT()) return TRUE; - if (g_blockEventsOnDrag) return TRUE; - - if (widget->window) - gdk_window_set_cursor( widget->window, wxSTANDARD_CURSOR->GetCursor() ); - - wxMouseEvent event( wxEVT_LEAVE_WINDOW ); - event.SetEventObject( win ); - return win->ProcessEvent( event ); -}; - -//----------------------------------------------------------------------------- -// wxWindow implementation +// wxWindow //----------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxWindow,wxEvtHandler) @@ -713,91 +875,99 @@ END_EVENT_TABLE() wxWindow::wxWindow() { - m_widget = NULL; - m_wxwindow = NULL; - m_parent = NULL; + m_widget = (GtkWidget *) NULL; + m_wxwindow = (GtkWidget *) NULL; + m_parent = (wxWindow *) NULL; m_children.DeleteContents( FALSE ); m_x = 0; m_y = 0; m_width = 0; m_height = 0; + m_minWidth = -1; + m_minHeight = -1; + m_maxWidth = -1; + m_maxHeight = -1; m_retCode = 0; m_eventHandler = this; - m_windowValidator = NULL; + m_windowValidator = (wxValidator *) NULL; m_windowId = -1; - m_cursor = new wxCursor( wxCURSOR_ARROW ); + m_cursor = (wxCursor *) NULL; m_font = *wxSWISS_FONT; m_windowStyle = 0; m_windowName = "noname"; - m_constraints = NULL; - m_constraintsInvolvedIn = NULL; - m_windowSizer = NULL; - m_sizerParent = NULL; + 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_hAdjust = NULL; - m_vAdjust = NULL; + 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_drawingOffsetX = 0; - m_drawingOffsetY = 0; - m_pDropTarget = NULL; + m_pDropTarget = (wxDropTarget *) NULL; m_resizing = FALSE; -}; - -wxWindow::wxWindow( wxWindow *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size, - long style, const wxString &name ) -{ - m_cursor = NULL; - Create( parent, id, pos, size, style, name ); -}; + m_hasOwnStyle = FALSE; +} bool wxWindow::Create( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, - long style, const wxString &name ) + long style, const wxString &name ) { m_isShown = FALSE; m_isEnabled = TRUE; m_needParent = TRUE; - + + m_cursor = (wxCursor *) NULL; + PreCreation( parent, id, pos, size, style, name ); - - m_widget = gtk_scrolled_window_new( NULL, NULL ); + + m_widget = gtk_scrolled_window_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL ); m_hasScrolling = TRUE; - - GtkScrolledWindow *s_window; - s_window = GTK_SCROLLED_WINDOW(m_widget); - + + 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; - + gtk_scrolled_window_set_policy( s_window, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC ); - + m_oldHorizontalPos = 0.0; m_oldVerticalPos = 0.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", + + 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", + gtk_signal_connect( GTK_OBJECT(m_vAdjust), "value_changed", (GtkSignalFunc) gtk_window_vscroll_callback, (gpointer) this ); - - gtk_signal_connect (GTK_OBJECT (m_hAdjust), "changed", + + gtk_signal_connect( GTK_OBJECT(m_hAdjust), "changed", (GtkSignalFunc) gtk_window_hscroll_change_callback, (gpointer) this ); - gtk_signal_connect (GTK_OBJECT (m_vAdjust), "changed", + gtk_signal_connect(GTK_OBJECT(m_vAdjust), "changed", (GtkSignalFunc) gtk_window_vscroll_change_callback, (gpointer) this ); - - GtkViewport *viewport; - viewport = GTK_VIEWPORT(s_window->viewport); - + + GtkViewport *viewport = GTK_VIEWPORT(s_window->viewport); + if (m_windowStyle & wxRAISED_BORDER) { gtk_viewport_set_shadow_type( viewport, GTK_SHADOW_OUT ); @@ -809,12 +979,12 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id, else { gtk_viewport_set_shadow_type( viewport, GTK_SHADOW_NONE ); - }; - + } + m_wxwindow = gtk_myfixed_new(); - + if (m_wxwindow) 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 @@ -825,8 +995,8 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id, // 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) ); - - // I _really_ don't want scrollbars in the beginning + + // I _really_ don't want scrollbars in the beginning m_vAdjust->lower = 0.0; m_vAdjust->upper = 1.0; m_vAdjust->value = 0.0; @@ -841,31 +1011,31 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id, m_hAdjust->page_increment = 1.0; m_hAdjust->page_size = 5.0; gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" ); - + gtk_widget_show( m_wxwindow ); - + PostCreation(); - + Show( TRUE ); - return TRUE; -}; + return TRUE; +} wxWindow::~wxWindow(void) { m_hasVMT = FALSE; - + if (m_pDropTarget) delete m_pDropTarget; - + if (m_parent) m_parent->RemoveChild( this ); if (m_widget) Show( FALSE ); DestroyChildren(); - + if (m_wxwindow) gtk_widget_destroy( m_wxwindow ); - + if (m_widget) gtk_widget_destroy( m_widget ); - + wxDELETE(m_cursor); DeleteRelatedConstraints(); @@ -875,16 +1045,15 @@ wxWindow::~wxWindow(void) // in other windows' constraintsInvolvedIn lists. UnsetConstraints(m_constraints); delete m_constraints; - m_constraints = NULL; + m_constraints = (wxLayoutConstraints *) NULL; } if (m_windowSizer) { delete m_windowSizer; - m_windowSizer = NULL; + 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_sizerParent) m_sizerParent->RemoveChild((wxWindow *)this); // Just in case the window has been Closed, but // we're then deleting immediately: don't leave @@ -895,17 +1064,18 @@ wxWindow::~wxWindow(void) // wxWindow::LoadNativeDialog but we weren't a dialog // class wxTopLevelWindows.DeleteObject(this); - -}; + + if (m_windowValidator) delete m_windowValidator; +} 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 ); + wxFatalError( "Need complete parent.", name ); - m_widget = NULL; + m_widget = (GtkWidget *) NULL; m_hasVMT = FALSE; m_parent = parent; m_children.DeleteContents( FALSE ); @@ -915,9 +1085,12 @@ void wxWindow::PreCreation( wxWindow *parent, wxWindowID id, if (m_width == -1) m_width = 20; m_height = size.y; if (m_height == -1) m_height = 20; + m_minWidth = -1; + m_minHeight = -1; + m_maxWidth = -1; + m_maxHeight = -1; m_retCode = 0; m_eventHandler = this; - m_windowValidator = NULL; m_windowId = id; m_sizeSet = FALSE; if (m_cursor == NULL) @@ -927,147 +1100,130 @@ void wxWindow::PreCreation( wxWindow *parent, wxWindowID id, m_foregroundColour = wxBLACK; m_windowStyle = style; m_windowName = name; - m_constraints = NULL; - m_constraintsInvolvedIn = NULL; - m_windowSizer = NULL; - m_sizerParent = NULL; + m_constraints = (wxLayoutConstraints *) NULL; + m_constraintsInvolvedIn = (wxList *) NULL; + m_windowSizer = (wxSizer *) NULL; + m_sizerParent = (wxWindow *) NULL; m_autoLayout = FALSE; - m_drawingOffsetX = 0; - m_drawingOffsetY = 0; - m_pDropTarget = NULL; + m_hasScrolling = FALSE; + m_isScrolling = FALSE; + m_pDropTarget = (wxDropTarget *) NULL; m_resizing = FALSE; + m_windowValidator = (wxValidator *) NULL; + m_hasOwnStyle = FALSE; } void wxWindow::PostCreation(void) { if (m_parent) m_parent->AddChild( this ); - -// GtkStyle *style = m_widget->style; -// style->font = m_font.GetInternalFont( 1.0 ); // destroy old font ? - - GtkWidget *connect_widget = m_widget; - if (m_wxwindow) connect_widget = m_wxwindow; - - gtk_object_set_data (GTK_OBJECT (connect_widget), "MyWxWindow", (gpointer)this ); - + if (m_wxwindow) { - gtk_signal_connect( GTK_OBJECT(m_wxwindow), "expose_event", + 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_connect( GTK_OBJECT(m_wxwindow), "draw", GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this ); - }; - -/* - gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate", - GTK_SIGNAL_FUNC(gtk_window_size_callback), (gpointer)this ); -*/ + } + + ConnectWidget( GetConnectWidget() ); + + if (m_widget && m_parent) gtk_widget_realize( m_widget ); + + if (m_wxwindow) + { + gtk_widget_realize( m_wxwindow ); + gdk_gc_set_exposures( m_wxwindow->style->fg_gc[0], TRUE ); + } + + SetCursor( *wxSTANDARD_CURSOR ); - gtk_signal_connect( GTK_OBJECT(connect_widget), "key_press_event", + 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(connect_widget), "button_press_event", + gtk_signal_connect( GTK_OBJECT(widget), "button_press_event", GTK_SIGNAL_FUNC(gtk_window_button_press_callback), (gpointer)this ); - - gtk_signal_connect( GTK_OBJECT(connect_widget), "button_release_event", + + gtk_signal_connect( GTK_OBJECT(widget), "button_release_event", GTK_SIGNAL_FUNC(gtk_window_button_release_callback), (gpointer)this ); - - gtk_signal_connect( GTK_OBJECT(connect_widget), "motion_notify_event", + + gtk_signal_connect( GTK_OBJECT(widget), "motion_notify_event", GTK_SIGNAL_FUNC(gtk_window_motion_notify_callback), (gpointer)this ); - - gtk_signal_connect( GTK_OBJECT(connect_widget), "focus_in_event", + + gtk_signal_connect( GTK_OBJECT(widget), "focus_in_event", GTK_SIGNAL_FUNC(gtk_window_focus_in_callback), (gpointer)this ); - gtk_signal_connect( GTK_OBJECT(connect_widget), "focus_out_event", + gtk_signal_connect( GTK_OBJECT(widget), "focus_out_event", GTK_SIGNAL_FUNC(gtk_window_focus_out_callback), (gpointer)this ); - // Only for cursor handling - - gtk_signal_connect( GTK_OBJECT(m_widget), "enter_notify_event", + gtk_signal_connect( GTK_OBJECT(widget), "enter_notify_event", GTK_SIGNAL_FUNC(gtk_window_enter_callback), (gpointer)this ); - - gtk_signal_connect( GTK_OBJECT(m_widget), "leave_notify_event", - GTK_SIGNAL_FUNC(gtk_window_leave_callback), (gpointer)this ); - - if (m_wxwindow) - { - gtk_signal_connect( GTK_OBJECT(m_wxwindow), "enter_notify_event", - GTK_SIGNAL_FUNC(gtk_window_enter_callback), (gpointer)this ); - - gtk_signal_connect( GTK_OBJECT(m_wxwindow), "leave_notify_event", - GTK_SIGNAL_FUNC(gtk_window_leave_callback), (gpointer)this ); - }; - -/* - // Does destroy ever get called ? - gtk_signal_connect( GTK_OBJECT(m_widget), "destroy_event", - GTK_SIGNAL_FUNC(gtk_window_destroy_callback), (gpointer)this ); - - if (m_wxwindow) - { - gtk_signal_connect( GTK_OBJECT(m_wxwindow), "destroy_event", - GTK_SIGNAL_FUNC(gtk_window_destroy_callback), (gpointer)this ); - }; -*/ - - if (m_widget && m_parent) gtk_widget_realize( m_widget ); - if (m_wxwindow) gtk_widget_realize( m_wxwindow ); - - SetCursor( wxSTANDARD_CURSOR ); - - m_hasVMT = TRUE; -}; + gtk_signal_connect( GTK_OBJECT(widget), "leave_notify_event", + GTK_SIGNAL_FUNC(gtk_window_leave_callback), (gpointer)this ); +} bool wxWindow::HasVMT(void) { return m_hasVMT; -}; +} bool wxWindow::Close( bool force ) { + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId); event.SetEventObject(this); event.SetForce(force); return GetEventHandler()->ProcessEvent(event); -}; +} bool wxWindow::Destroy(void) { + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + m_hasVMT = FALSE; delete this; return TRUE; -}; +} bool wxWindow::DestroyChildren(void) { - if (GetChildren()) + if (GetChildren()) { wxNode *node; - while ((node = GetChildren()->First()) != (wxNode *)NULL) + while ((node = GetChildren()->First()) != (wxNode *)NULL) { wxWindow *child; - if ((child = (wxWindow *)node->Data()) != (wxWindow *)NULL) + if ((child = (wxWindow *)node->Data()) != (wxWindow *)NULL) { delete child; - if (GetChildren()->Member(child)) delete node; - }; - }; - }; + if (GetChildren()->Member(child)) delete node; + } + } + } return TRUE; -}; +} void wxWindow::PrepareDC( wxDC &WXUNUSED(dc) ) { // are we to set fonts here ? -}; +} void wxWindow::ImplementSetSize(void) -{ +{ + 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; gtk_widget_set_usize( m_widget, m_width, m_height ); -}; +} void wxWindow::ImplementSetPosition(void) { @@ -1077,86 +1233,92 @@ void wxWindow::ImplementSetPosition(void) gtk_widget_set_uposition( m_widget, m_x, m_y ); return; } - + if (!m_parent) { - printf( _("wxWindow::SetSize error.\n") ); + wxFAIL_MSG( "wxWindow::SetSize error.\n" ); return; } - + if ((m_parent) && (m_parent->m_wxwindow)) gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), m_widget, m_x, m_y ); - - // Don't do anything for children of wxNotebook and wxMDIChildFrame -}; + + // Don't do anything for children of wxNotebook and wxMDIChildFrame +} void wxWindow::SetSize( int x, int y, int width, int height, int sizeFlags ) { + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + if (m_resizing) return; // I don't like recursions m_resizing = TRUE; - + int newX = x; int newY = y; int newW = width; int newH = height; - + if ((sizeFlags & wxSIZE_USE_EXISTING) == wxSIZE_USE_EXISTING) { if (newX == -1) newX = m_x; if (newY == -1) newY = m_y; if (newW == -1) newW = m_width; if (newH == -1) newH = m_height; - }; - + } + if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH) { if (newW == -1) newW = 80; - }; - + } + if ((sizeFlags & wxSIZE_AUTO_HEIGHT) == wxSIZE_AUTO_HEIGHT) { if (newH == -1) newH = 26; - }; - + } + if ((m_x != newX) || (m_y != newY) || (!m_sizeSet)) { m_x = newX; m_y = newY; ImplementSetPosition(); - }; + } if ((m_width != newW) || (m_height != newH) || (!m_sizeSet)) { m_width = newW; m_height = newH; ImplementSetSize(); - }; + } m_sizeSet = TRUE; - + wxSizeEvent event( wxSize(m_width,m_height), GetId() ); event.SetEventObject( this ); ProcessEvent( event ); - + m_resizing = FALSE; -}; +} void wxWindow::SetSize( int width, int height ) { SetSize( -1, -1, width, height, wxSIZE_USE_EXISTING ); -}; +} void wxWindow::Move( int x, int y ) { SetSize( x, y, -1, -1, wxSIZE_USE_EXISTING ); -}; +} void wxWindow::GetSize( int *width, int *height ) const { + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + if (width) (*width) = m_width; if (height) (*height) = m_height; -}; +} void wxWindow::SetClientSize( int width, int height ) { + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + if (!m_wxwindow) { SetSize( width, height ); @@ -1165,14 +1327,14 @@ void wxWindow::SetClientSize( int width, int height ) { int dw = 0; int dh = 0; - + 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; */ @@ -1181,40 +1343,41 @@ void wxWindow::SetClientSize( int width, int height ) { GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget); GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass ); - + GtkWidget *viewport = scroll_window->viewport; GtkStyleClass *viewport_class = viewport->style->klass; - + GtkWidget *hscrollbar = scroll_window->hscrollbar; GtkWidget *vscrollbar = scroll_window->vscrollbar; - + if ((m_windowStyle & wxRAISED_BORDER) || - (m_windowStyle & wxSUNKEN_BORDER) - ) + (m_windowStyle & wxSUNKEN_BORDER)) { dw += 2 * viewport_class->xthickness; dh += 2 * viewport_class->ythickness; - }; - + } + if (GTK_WIDGET_VISIBLE(vscrollbar)) { dw += vscrollbar->allocation.width; dw += scroll_class->scrollbar_spacing; - }; - + } + if (GTK_WIDGET_VISIBLE(hscrollbar)) { dh += hscrollbar->allocation.height; dw += scroll_class->scrollbar_spacing; - }; - }; - + } + } + SetSize( width+dw, height+dh ); - }; -}; + } +} void wxWindow::GetClientSize( int *width, int *height ) const { + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + if (!m_wxwindow) { if (width) (*width) = m_width; @@ -1224,14 +1387,14 @@ void wxWindow::GetClientSize( int *width, int *height ) const { int dw = 0; int dh = 0; - + 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; */ @@ -1240,101 +1403,106 @@ void wxWindow::GetClientSize( int *width, int *height ) const { GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget); GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass ); - + GtkWidget *viewport = scroll_window->viewport; GtkStyleClass *viewport_class = viewport->style->klass; - + GtkWidget *hscrollbar = scroll_window->hscrollbar; GtkWidget *vscrollbar = scroll_window->vscrollbar; - + if ((m_windowStyle & wxRAISED_BORDER) || - (m_windowStyle & wxSUNKEN_BORDER) - ) + (m_windowStyle & wxSUNKEN_BORDER)) { dw += 2 * viewport_class->xthickness; dh += 2 * viewport_class->ythickness; - }; - + } + if (GTK_WIDGET_VISIBLE(vscrollbar)) { // dw += vscrollbar->allocation.width; dw += 15; // range.slider_width = 11 + 2*2pts edge dw += scroll_class->scrollbar_spacing; - }; - + } + if (GTK_WIDGET_VISIBLE(hscrollbar)) { // dh += hscrollbar->allocation.height; dh += 15; dh += scroll_class->scrollbar_spacing; - }; - }; - + } + } + if (width) (*width) = m_width - dw; if (height) (*height) = m_height - dh; - }; -}; + } +} void wxWindow::GetPosition( int *x, int *y ) const { + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + if (x) (*x) = m_x; if (y) (*y) = m_y; -}; +} void wxWindow::ClientToScreen( int *x, int *y ) { - // Does this look simple ? + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); - GdkWindow *source = NULL; + 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 ); if (!m_wxwindow) - { + { if (GTK_WIDGET_NO_WINDOW (m_widget)) { org_x += m_widget->allocation.x; org_y += m_widget->allocation.y; - }; - }; - - if (x) *x += org_x; - if (y) *y += org_y; -}; + } + } + + if (x) *x += org_x; + if (y) *y += org_y; +} void wxWindow::ScreenToClient( int *x, int *y ) { - GdkWindow *source = NULL; + wxASSERT_MSG( (m_widget != NULL), "invalid 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 ); if (!m_wxwindow) - { + { if (GTK_WIDGET_NO_WINDOW (m_widget)) { org_x += m_widget->allocation.x; org_y += m_widget->allocation.y; - }; - }; - - if (x) *x -= org_x; - if (y) *y -= org_y; -}; + } + } + + if (x) *x -= org_x; + if (y) *y -= org_y; +} void wxWindow::Centre( int direction ) { + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + if (IS_KIND_OF(this,wxDialog) || IS_KIND_OF(this,wxFrame)) { if (direction & wxHORIZONTAL == wxHORIZONTAL) m_x = (gdk_screen_width () - m_width) / 2; @@ -1351,12 +1519,14 @@ void wxWindow::Centre( int direction ) if (direction & wxHORIZONTAL == wxHORIZONTAL) m_x = (p_w - m_width) / 2; if (direction & wxVERTICAL == wxVERTICAL) m_y = (p_h - m_height) / 2; ImplementSetPosition(); - }; + } } -}; +} void wxWindow::Fit(void) { + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + int maxX = 0; int maxY = 0; wxNode *node = GetChildren()->First(); @@ -1374,29 +1544,93 @@ void wxWindow::Fit(void) node = node->Next(); } SetClientSize(maxX + 5, maxY + 10); -}; +} + +void wxWindow::SetSizeHints( int minW, int minH, int maxW, int maxH, int WXUNUSED(incW), int WXUNUSED(incH) ) +{ + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + + m_minWidth = minW; + m_minHeight = minH; + m_maxWidth = maxW; + m_maxHeight = maxH; +} void wxWindow::OnSize( wxSizeEvent &WXUNUSED(event) ) { //if (GetAutoLayout()) Layout(); -}; +} bool wxWindow::Show( bool show ) { + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + if (show) gtk_widget_show( m_widget ); else gtk_widget_hide( m_widget ); - m_isShown = show; + m_isShown = show; return TRUE; -}; +} void wxWindow::Enable( bool enable ) { + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + m_isEnabled = enable; gtk_widget_set_sensitive( m_widget, enable ); if (m_wxwindow) gtk_widget_set_sensitive( m_wxwindow, enable ); -}; +} + +int wxWindow::GetCharHeight(void) const +{ + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + + if (!m_font.Ok()) + { + wxFAIL_MSG( "invalid font" ); + return -1; + } + + GdkFont *font = m_font.GetInternalFont( 1.0 ); + return font->ascent + font->descent; +} + +int wxWindow::GetCharWidth(void) const +{ + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + + if (!m_font.Ok()) + { + wxFAIL_MSG( "invalid font" ); + return -1; + } + + 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" ); + + wxFont fontToUse = m_font; + if (theFont) fontToUse = *theFont; + + 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; // ?? +} void wxWindow::MakeModal( bool modal ) { @@ -1418,198 +1652,250 @@ void wxWindow::MakeModal( bool modal ) void wxWindow::SetFocus(void) { - GtkWidget *connect_widget = m_widget; - if (m_wxwindow) connect_widget = m_wxwindow; + 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) ) { gtk_widget_grab_focus (connect_widget); - }; - }; -}; + } + } +} bool wxWindow::OnClose(void) { return TRUE; -}; +} void wxWindow::AddChild( wxWindow *child ) { + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + wxASSERT_MSG( (m_wxwindow != NULL), "window need client area" ); + wxASSERT_MSG( (child != NULL), "invalid child" ); + wxASSERT_MSG( (child->m_widget != NULL), "invalid child" ); + // Addchild is (often) called before the program // has left the parents constructor so that no // virtual tables work yet. The approach below // practically imitates virtual tables, i.e. it // implements a different AddChild() behaviour - // for wxFrame, wxDialog, wxWindow and + // for wxFrame, wxDialog, wxWindow and // wxMDIParentFrame. // wxFrame and wxDialog as children aren't placed into the parents - + if (( IS_KIND_OF(child,wxFrame) || IS_KIND_OF(child,wxDialog) ) && (!IS_KIND_OF(child,wxMDIChildFrame))) { m_children.Append( child ); - + if ((child->m_x != -1) && (child->m_y != -1)) gtk_widget_set_uposition( child->m_widget, child->m_x, child->m_y ); - + return; } - - // In the case of an wxMDIChildFrame descendant, we use the + + // In the case of an wxMDIChildFrame descendant, we use the // client windows's AddChild() - + if (IS_KIND_OF(this,wxMDIParentFrame)) { if (IS_KIND_OF(child,wxMDIChildFrame)) { wxMDIClientWindow *client = ((wxMDIParentFrame*)this)->GetClientWindow(); if (client) - { + { client->AddChild( child ); return; } } } - + // wxNotebook is very special, so it has a private AddChild() - + if (IS_KIND_OF(this,wxNotebook)) { wxNotebook *tab = (wxNotebook*)this; tab->AddChild( child ); return; } - + // wxFrame has a private AddChild - + if (IS_KIND_OF(this,wxFrame) && !IS_KIND_OF(this,wxMDIChildFrame)) { wxFrame *frame = (wxFrame*)this; frame->AddChild( child ); return; } - + // All the rest - + m_children.Append( child ); - if (m_wxwindow) gtk_myfixed_put( GTK_MYFIXED(m_wxwindow), child->m_widget, + if (m_wxwindow) gtk_myfixed_put( GTK_MYFIXED(m_wxwindow), child->m_widget, child->m_x, child->m_y ); - + gtk_widget_set_usize( child->m_widget, child->m_width, child->m_height ); -}; +} wxList *wxWindow::GetChildren(void) { return (&m_children); -}; +} void wxWindow::RemoveChild( wxWindow *child ) { if (GetChildren()) - GetChildren()->DeleteObject( child ); - child->m_parent = NULL; -}; + GetChildren()->DeleteObject( child ); + child->m_parent = (wxWindow *) NULL; +} void wxWindow::SetReturnCode( int retCode ) { m_retCode = retCode; -}; +} int wxWindow::GetReturnCode(void) { return m_retCode; -}; +} + +void wxWindow::Raise(void) +{ + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + + if (m_widget) gdk_window_raise( m_widget->window ); +} -wxWindow *wxWindow::GetParent(void) +void wxWindow::Lower(void) { - return m_parent; -}; + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + + if (m_widget) gdk_window_lower( m_widget->window ); +} wxEvtHandler *wxWindow::GetEventHandler(void) { return m_eventHandler; -}; +} -void wxWindow::SetEventhandler( wxEvtHandler *handler ) +void wxWindow::SetEventHandler( wxEvtHandler *handler ) { m_eventHandler = handler; -}; +} + +void wxWindow::PushEventHandler(wxEvtHandler *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) + { + delete handlerA; + return (wxEvtHandler*) NULL; + } + else + return handlerA; + } + else + return (wxEvtHandler *) NULL; +} wxValidator *wxWindow::GetValidator(void) { return m_windowValidator; -}; +} -void wxWindow::SetValidator( wxValidator *validator ) +void wxWindow::SetValidator( const wxValidator& validator ) { - m_windowValidator = validator; -}; + if (m_windowValidator) delete m_windowValidator; + m_windowValidator = validator.Clone(); + if (m_windowValidator) m_windowValidator->SetWindow(this); +} bool wxWindow::IsBeingDeleted(void) { return FALSE; -}; +} void wxWindow::SetId( wxWindowID id ) { m_windowId = id; -}; +} wxWindowID wxWindow::GetId(void) { return m_windowId; -}; +} void wxWindow::SetCursor( const wxCursor &cursor ) { - wxASSERT(m_cursor != NULL); + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); - if (m_cursor != NULL) - if (*m_cursor == cursor) - return; - (*m_cursor) = cursor; - if (m_widget->window) + if (m_cursor == NULL) + { + wxFAIL_MSG( "wxWindow::SetCursor m_cursor == NULL" ); + m_cursor = new wxCursor( wxCURSOR_ARROW ); + } + + if (cursor.Ok()) + { + if (*((wxCursor*)&cursor) == m_cursor) return; + *m_cursor = cursor; + } + else + { + *m_cursor = *wxSTANDARD_CURSOR; + } + + if ((m_widget) && (m_widget->window)) gdk_window_set_cursor( m_widget->window, m_cursor->GetCursor() ); - if (m_wxwindow && m_wxwindow->window) + + if ((m_wxwindow) && (m_wxwindow->window)) gdk_window_set_cursor( m_wxwindow->window, m_cursor->GetCursor() ); -}; +} void wxWindow::Refresh( bool eraseBackground, const wxRect *rect ) { + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + if (eraseBackground && m_wxwindow && m_wxwindow->window) { if (rect) - gdk_window_clear_area( m_wxwindow->window, - rect->x, - rect->y, - rect->width, + gdk_window_clear_area( m_wxwindow->window, + rect->x, + rect->y, + rect->width, rect->height ); else Clear(); - }; + } if (!rect) { if (m_wxwindow) { - wxClientDC dc(this); - PrepareDC(dc); - long x = 0; - long y = 0; - dc.GetInternalDeviceOrigin( &x, &y ); - int w = 0; int h = 0; GetClientSize( &w, &h ); - + GdkRectangle gdk_rect; - gdk_rect.x = x; - gdk_rect.y = y; + gdk_rect.x = 0; + gdk_rect.y = 0; gdk_rect.width = w; gdk_rect.height = h; gtk_widget_draw( m_wxwindow, &gdk_rect ); - }; + } } else { @@ -1618,61 +1904,94 @@ void wxWindow::Refresh( bool eraseBackground, const wxRect *rect ) gdk_rect.y = rect->y; gdk_rect.width = rect->width; gdk_rect.height = rect->height; - + if (m_wxwindow) gtk_widget_draw( m_wxwindow, &gdk_rect ); else gtk_widget_draw( m_widget, &gdk_rect ); - }; -}; + } +} + +wxRegion wxWindow::GetUpdateRegion() const +{ + return m_updateRegion; +} -bool wxWindow::IsExposed( long x, long y ) +bool wxWindow::IsExposed( int x, int y) const { return (m_updateRegion.Contains( x, y ) != wxOutRegion ); -}; +} + +bool wxWindow::IsExposed( int x, int y, int w, int h ) const +{ + return (m_updateRegion.Contains( x, y, w, h ) != wxOutRegion ); +} -bool wxWindow::IsExposed( long x, long y, long width, long height ) +bool wxWindow::IsExposed( const wxPoint& pt ) const { - return (m_updateRegion.Contains( x, y, width, height ) != wxOutRegion ); -}; + return (m_updateRegion.Contains( pt.x, pt.y ) != wxOutRegion ); +} + +bool wxWindow::IsExposed( const wxRect& rect ) const +{ + return (m_updateRegion.Contains( rect.x, rect.y, rect.width, rect.height ) != wxOutRegion ); +} void wxWindow::Clear(void) { + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + if (m_wxwindow && m_wxwindow->window) gdk_window_clear( m_wxwindow->window ); -}; +} wxColour wxWindow::GetBackgroundColour(void) const { return m_backgroundColour; -}; +} void wxWindow::SetBackgroundColour( const wxColour &colour ) { + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + m_backgroundColour = colour; if (m_wxwindow) { m_backgroundColour.CalcPixel( m_wxwindow->style->colormap ); gdk_window_set_background( m_wxwindow->window, m_backgroundColour.GetColor() ); gdk_window_clear( m_wxwindow->window ); - }; + } // do something ? -}; +} + +wxColour wxWindow::GetForegroundColour(void) const +{ + return m_foregroundColour; +} + +void wxWindow::SetForegroundColour( const wxColour &colour ) +{ + m_foregroundColour = colour; +} bool wxWindow::Validate(void) { + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + wxNode *node = GetChildren()->First(); while (node) { wxWindow *child = (wxWindow *)node->Data(); - if (child->GetValidator() && /* child->GetValidator()->Ok() && */ !child->GetValidator()->Validate(this)) + if (child->GetValidator() && /* child->GetValidator()->Ok() && */ !child->GetValidator()->Validate(this)) { return FALSE; } node = node->Next(); - }; + } return TRUE; -}; +} bool wxWindow::TransferDataToWindow(void) { + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + wxNode *node = GetChildren()->First(); while (node) { @@ -1682,14 +2001,16 @@ bool wxWindow::TransferDataToWindow(void) { wxMessageBox( _("Application Error"), _("Could not transfer data to window"), wxOK|wxICON_EXCLAMATION ); return FALSE; - }; + } node = node->Next(); - }; + } return TRUE; -}; +} bool wxWindow::TransferDataFromWindow(void) { + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + wxNode *node = GetChildren()->First(); while (node) { @@ -1699,138 +2020,213 @@ bool wxWindow::TransferDataFromWindow(void) node = node->Next(); } return TRUE; -}; +} + +void wxWindow::SetAcceleratorTable( const wxAcceleratorTable& accel ) +{ + m_acceleratorTable = accel; +} void wxWindow::OnInitDialog( wxInitDialogEvent &WXUNUSED(event) ) { TransferDataToWindow(); -}; +} void wxWindow::InitDialog(void) { + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + wxInitDialogEvent event(GetId()); event.SetEventObject( this ); GetEventHandler()->ProcessEvent(event); -}; +} -void wxWindow::SetDropTarget( wxDropTarget *dropTarget ) +static void SetInvokingWindow( wxMenu *menu, wxWindow *win ) { - GtkWidget *dnd_widget = GetDropTargetWidget(); - - if (m_pDropTarget) + menu->SetInvokingWindow( win ); + wxNode *node = menu->m_items.First(); + while (node) { - gtk_signal_disconnect_by_func( GTK_OBJECT(dnd_widget), - GTK_SIGNAL_FUNC(gtk_window_drop_callback), (gpointer)this ); - - m_pDropTarget->UnregisterWidget( dnd_widget ); - delete m_pDropTarget; - }; + wxMenuItem *menuitem = (wxMenuItem*)node->Data(); + if (menuitem->IsSubMenu()) + SetInvokingWindow( menuitem->GetSubMenu(), win ); + node = node->Next(); + } +} + +bool wxWindow::PopupMenu( wxMenu *menu, int WXUNUSED(x), int WXUNUSED(y) ) +{ + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + + SetInvokingWindow( menu, this ); + gtk_menu_popup( + GTK_MENU(menu->m_menu), + (GtkWidget *)NULL, // parent menu shell + (GtkWidget *)NULL, // parent menu item + (GtkMenuPositionFunc)NULL, + NULL, // client data + 0, // button used to activate it + 0//gs_timeLastClick // the time of activation + ); + return TRUE; +} + +void wxWindow::SetDropTarget( wxDropTarget *dropTarget ) +{ + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + + GtkWidget *dnd_widget = GetConnectWidget(); + + DisconnectDnDWidget( dnd_widget ); + + if (m_pDropTarget) delete m_pDropTarget; m_pDropTarget = dropTarget; - if (m_pDropTarget) - { - m_pDropTarget->RegisterWidget( dnd_widget ); - - gtk_signal_connect( GTK_OBJECT(dnd_widget), "drop_data_available_event", - GTK_SIGNAL_FUNC(gtk_window_drop_callback), (gpointer)this ); - }; -}; + + ConnectDnDWidget( dnd_widget ); +} wxDropTarget *wxWindow::GetDropTarget() const { return m_pDropTarget; -}; +} + +void wxWindow::ConnectDnDWidget( GtkWidget *widget ) +{ + if (!m_pDropTarget) return; + + m_pDropTarget->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_pDropTarget) return; + + gtk_signal_disconnect_by_func( GTK_OBJECT(widget), + GTK_SIGNAL_FUNC(gtk_window_drop_callback), (gpointer)this ); -GtkWidget* wxWindow::GetDropTargetWidget(void) + m_pDropTarget->UnregisterWidget( widget ); +} + +GtkWidget* wxWindow::GetConnectWidget(void) { GtkWidget *connect_widget = m_widget; if (m_wxwindow) connect_widget = m_wxwindow; - + return connect_widget; } - + +bool wxWindow::IsOwnGtkWindow( GdkWindow *window ) +{ + if (m_wxwindow) return (window == m_wxwindow->window); + return (window == m_widget->window); +} + void wxWindow::SetFont( const wxFont &font ) { - m_font = font; -/* - create new style - copy old style values to new one - set font in new style - -> takes to many resources - - GtkStyle *style = gtk_style_new(); - ... -*/ -}; + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + + if (((wxFont*)&font)->Ok()) + m_font = font; + else + m_font = *wxSWISS_FONT; + + GtkStyle *style = (GtkStyle*) NULL; + if (!m_hasOwnStyle) + { + m_hasOwnStyle = TRUE; + style = gtk_style_copy( gtk_widget_get_style( m_widget ) ); + } + else + { + style = gtk_widget_get_style( m_widget ); + } + + gdk_font_unref( style->font ); + style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) ); + + gtk_widget_set_style( m_widget, style ); +} wxFont *wxWindow::GetFont(void) { return &m_font; -}; +} void wxWindow::SetWindowStyleFlag( long flag ) { m_windowStyle = flag; -}; +} long wxWindow::GetWindowStyleFlag(void) const { return m_windowStyle; -}; +} void wxWindow::CaptureMouse(void) { - GtkWidget *connect_widget = m_widget; - if (m_wxwindow) connect_widget = m_wxwindow; + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + + wxASSERT_MSG( (g_capturing == FALSE), "CaptureMouse called twice" ); + + GtkWidget *connect_widget = GetConnectWidget(); gtk_grab_add( connect_widget ); gdk_pointer_grab ( connect_widget->window, FALSE, (GdkEventMask) - (GDK_BUTTON_PRESS_MASK | + (GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | - GDK_POINTER_MOTION_MASK), - NULL, NULL, GDK_CURRENT_TIME ); -}; + GDK_POINTER_MOTION_MASK), + (GdkWindow *) NULL, (GdkCursor *) NULL, GDK_CURRENT_TIME ); + g_capturing = TRUE; +} void wxWindow::ReleaseMouse(void) { - GtkWidget *connect_widget = m_widget; - if (m_wxwindow) connect_widget = m_wxwindow; + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + + wxASSERT_MSG( (g_capturing == TRUE), "ReleaseMouse called twice" ); + + GtkWidget *connect_widget = GetConnectWidget(); gtk_grab_remove( connect_widget ); gdk_pointer_ungrab ( GDK_CURRENT_TIME ); -}; + g_capturing = FALSE; +} void wxWindow::SetTitle( const wxString &WXUNUSED(title) ) { -}; +} wxString wxWindow::GetTitle(void) const { return (wxString&)m_windowName; -}; +} wxString wxWindow::GetLabel(void) const { return GetTitle(); -}; +} void wxWindow::SetName( const wxString &name ) { m_windowName = name; -}; +} wxString wxWindow::GetName(void) const { return (wxString&)m_windowName; -}; +} bool wxWindow::IsShown(void) const { return m_isShown; -}; +} bool wxWindow::IsRetained(void) { return FALSE; -}; +} wxWindow *wxWindow::FindWindow( long id ) { @@ -1842,9 +2238,9 @@ wxWindow *wxWindow::FindWindow( long id ) wxWindow *res = child->FindWindow( id ); if (res) return res; node = node->Next(); - }; - return NULL; -}; + } + return (wxWindow *) NULL; +} wxWindow *wxWindow::FindWindow( const wxString& name ) { @@ -1856,83 +2252,83 @@ wxWindow *wxWindow::FindWindow( const wxString& name ) wxWindow *res = child->FindWindow( name ); if (res) return res; node = node->Next(); - }; - return NULL; -}; + } + return (wxWindow *) NULL; +} void wxWindow::SetScrollbar( int orient, int pos, int thumbVisible, - int range, bool WXUNUSED(refresh) ) + int range, bool refresh ) { + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + + wxASSERT_MSG( (m_wxwindow != NULL), "window needs client area" ); + if (!m_wxwindow) return; if (orient == wxHORIZONTAL) { float fpos = (float)pos; - m_oldHorizontalPos = fpos; float frange = (float)range; float fthumb = (float)thumbVisible; - - if ((fabs(fpos-m_hAdjust->value) < 0.2) && - (fabs(frange-m_hAdjust->upper) < 0.2) && - (fabs(fthumb-m_hAdjust->page_size) < 0.2)) + + if ((fabs(frange-m_hAdjust->upper) < 0.2) && + (fabs(fthumb-m_hAdjust->page_size) < 0.2)) + { + SetScrollPos( orient, pos, refresh ); return; - + } + + m_oldHorizontalPos = fpos; + m_hAdjust->lower = 0.0; m_hAdjust->upper = frange; m_hAdjust->value = fpos; m_hAdjust->step_increment = 1.0; - m_hAdjust->page_increment = (float)(wxMax(fthumb-2,0)); + m_hAdjust->page_increment = (float)(wxMax(fthumb,0)); m_hAdjust->page_size = fthumb; } else { float fpos = (float)pos; - m_oldVerticalPos = fpos; float frange = (float)range; float fthumb = (float)thumbVisible; - - if ((fabs(fpos-m_vAdjust->value) < 0.2) && - (fabs(frange-m_vAdjust->upper) < 0.2) && - (fabs(fthumb-m_vAdjust->page_size) < 0.2)) + + if ((fabs(frange-m_vAdjust->upper) < 0.2) && + (fabs(fthumb-m_vAdjust->page_size) < 0.2)) + { + SetScrollPos( orient, pos, refresh ); return; - + } + + m_oldVerticalPos = fpos; + m_vAdjust->lower = 0.0; m_vAdjust->upper = frange; m_vAdjust->value = fpos; m_vAdjust->step_increment = 1.0; - m_vAdjust->page_increment = (float)(wxMax(fthumb-2,0)); + m_vAdjust->page_increment = (float)(wxMax(fthumb,0)); m_vAdjust->page_size = fthumb; - }; - + } + if (m_wxwindow->window) { if (orient == wxHORIZONTAL) - { -/* - m_drawingOffsetX = -16000; - - gtk_myfixed_set_offset( GTK_MYFIXED(m_wxwindow), m_drawingOffsetX, m_drawingOffsetY ); -*/ gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" ); - } else - { -/* - m_drawingOffsetY = -16000; - - gtk_myfixed_set_offset( GTK_MYFIXED(m_wxwindow), m_drawingOffsetX, m_drawingOffsetY ); -*/ gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" ); - } - + gtk_widget_set_usize( m_widget, m_width, m_height ); - }; -}; + } +} void wxWindow::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) ) { + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + + wxASSERT_MSG( (m_wxwindow != NULL), "window needs client area" ); + if (!m_wxwindow) return; - + if (orient == wxHORIZONTAL) { float fpos = (float)pos; @@ -1947,86 +2343,81 @@ void wxWindow::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) ) m_oldVerticalPos = fpos; if (fabs(fpos-m_vAdjust->value) < 0.2) return; m_vAdjust->value = fpos; - }; - - if (m_wxwindow->window) - { - if (orient == wxHORIZONTAL) - gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" ); - else - gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" ); - }; -}; + } + + if (!m_isScrolling) + { + if (m_wxwindow->window) + { + if (orient == wxHORIZONTAL) + gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" ); + else + gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" ); + } + } +} int wxWindow::GetScrollThumb( int orient ) const { + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + + wxASSERT_MSG( (m_wxwindow != NULL), "window needs client area" ); + if (!m_wxwindow) return 0; if (orient == wxHORIZONTAL) return (int)(m_hAdjust->page_size+0.5); else return (int)(m_vAdjust->page_size+0.5); -}; +} int wxWindow::GetScrollPos( int orient ) const { + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + + wxASSERT_MSG( (m_wxwindow != NULL), "window needs client area" ); + if (!m_wxwindow) return 0; if (orient == wxHORIZONTAL) return (int)(m_hAdjust->value+0.5); else return (int)(m_vAdjust->value+0.5); -}; +} int wxWindow::GetScrollRange( int orient ) const { + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + + wxASSERT_MSG( (m_wxwindow != NULL), "window needs client area" ); + if (!m_wxwindow) return 0; if (orient == wxHORIZONTAL) return (int)(m_hAdjust->upper+0.5); else return (int)(m_vAdjust->upper+0.5); -}; +} void wxWindow::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) ) { + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + + wxASSERT_MSG( (m_wxwindow != NULL), "window needs client area" ); + if (!m_wxwindow) return; - - bool refresh = FALSE; - - if ((m_drawingOffsetX == 0) && (m_drawingOffsetY == 0)) - { - m_drawingOffsetX = -16000; - m_drawingOffsetY = -16000; - refresh = TRUE; - } - else - { - m_drawingOffsetX += dx; - m_drawingOffsetY += dy; - } - -// printf( "X: %d Y: %d \n", (int)m_drawingOffsetX, (int)m_drawingOffsetY ); - - gtk_myfixed_set_offset( GTK_MYFIXED(m_wxwindow), m_drawingOffsetX, m_drawingOffsetY ); - - if (refresh) Refresh(); - -/* - The code here is very nifty, but it doesn't work with - overlapping windows... int cw = 0; int ch = 0; GetClientSize( &cw, &ch ); - + int w = cw - abs(dx); int h = ch - abs(dy); if ((h < 0) || (w < 0)) { Refresh(); return; - }; + } int s_x = 0; int s_y = 0; if (dx < 0) s_x = -dx; @@ -2037,22 +2428,15 @@ void wxWindow::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) ) if (dy > 0) d_y = dy; gdk_window_copy_area( m_wxwindow->window, m_wxwindow->style->fg_gc[0], d_x, d_y, m_wxwindow->window, s_x, s_y, w, h ); - + wxRect rect; if (dx < 0) rect.x = cw+dx; else rect.x = 0; if (dy < 0) rect.y = ch+dy; else rect.y = 0; if (dy != 0) rect.width = cw; else rect.width = abs(dx); if (dx != 0) rect.height = ch; else rect.height = abs(dy); - - Refresh( TRUE, &rect ); -*/ -}; -void wxWindow::GetDrawingOffset( long *x, long *y ) -{ - if (x) *x = m_drawingOffsetX; - if (y) *y = m_drawingOffsetY; -}; + Refresh( TRUE, &rect ); +} //------------------------------------------------------------------------------------- // Layout @@ -2061,7 +2445,7 @@ void wxWindow::GetDrawingOffset( long *x, long *y ) wxLayoutConstraints *wxWindow::GetConstraints(void) const { return m_constraints; -}; +} void wxWindow::SetConstraints( wxLayoutConstraints *constraints ) { @@ -2098,27 +2482,27 @@ void wxWindow::SetConstraints( wxLayoutConstraints *constraints ) void wxWindow::SetAutoLayout( bool autoLayout ) { m_autoLayout = autoLayout; -}; +} bool wxWindow::GetAutoLayout(void) const { return m_autoLayout; -}; +} wxSizer *wxWindow::GetSizer(void) const { return m_windowSizer; -}; +} void wxWindow::SetSizerParent( wxWindow *win ) { m_sizerParent = win; -}; +} wxWindow *wxWindow::GetSizerParent(void) const { return m_sizerParent; -}; +} // This removes any dangling pointers to this window // in other windows' constraintsInvolvedIn lists. @@ -2190,7 +2574,7 @@ void wxWindow::DeleteRelatedConstraints(void) node = next; } delete m_constraintsInvolvedIn; - m_constraintsInvolvedIn = NULL; + m_constraintsInvolvedIn = (wxList *) NULL; } } @@ -2214,7 +2598,7 @@ bool wxWindow::Layout(void) GetConstraints()->width.SetValue(w); GetConstraints()->height.SetValue(h); } - + // If top level (one sizer), evaluate the sizer's constraints. if (GetSizer()) { @@ -2255,7 +2639,7 @@ bool wxWindow::LayoutPhase1(int *noChanges) bool wxWindow::LayoutPhase2(int *noChanges) { *noChanges = 0; - + // Layout children DoPhase(1); DoPhase(2); @@ -2396,7 +2780,7 @@ void wxWindow::TransformSizerToActual(int *x, int *y) const if (!m_sizerParent || m_sizerParent->IsKindOf(CLASSINFO(wxDialog)) || m_sizerParent->IsKindOf(CLASSINFO(wxFrame)) ) return; - + int xp, yp; m_sizerParent->GetPosition(&xp, &yp); m_sizerParent->TransformSizerToActual(&xp, &yp);