X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/082b27986b4f0f6751c1482992fc0d9eae5a931e..186005466d585f5553e6acc7d963cd5b62c3ea9f:/include/wx/gtk1/window.h diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h index 6730525a86..63d0569d6f 100644 --- a/include/wx/gtk1/window.h +++ b/include/wx/gtk1/window.h @@ -86,7 +86,7 @@ public: const wxFont *theFont = (const wxFont *) NULL) const; - virtual bool PopupMenu( wxMenu *menu, int x, int y ); + virtual bool DoPopupMenu( wxMenu *menu, int x, int y ); virtual void SetScrollbar( int orient, int pos, int thumbVisible, int range, bool refresh = TRUE ); @@ -120,13 +120,14 @@ public: /* For compatibility across platforms (not in event table) */ void OnIdle(wxIdleEvent& WXUNUSED(event)) {}; - /* used by all classes in the widget creation process */ - void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos, - const wxSize &size, long style, const wxString &name ); + /* used by all window classes in the widget creation process */ + bool PreCreation( wxWindow *parent, const wxPoint &pos, const wxSize &size ); void PostCreation(); - void InsertChild(wxWindow *child) { (*m_insertCallback)(this, child); } - void DoAddChild(wxWindow *child) { AddChild(child); InsertChild(child); } + /* internal addition of child windows. differs from class + to class not by using virtual functions but by using + the m_insertCallback */ + void DoAddChild(wxWindow *child); /* the methods below are required because many native widgets are composed of several subwidgets and setting a style for @@ -139,14 +140,14 @@ public: virtual bool IsOwnGtkWindow( GdkWindow *window ); void ConnectWidget( GtkWidget *widget ); - // creates a new widget style if none is there - // and sets m_widgetStyle to this value. + /* creates a new widget style if none is there + and sets m_widgetStyle to this value. */ GtkStyle *GetWidgetStyle(); - // called by SetFont() and SetXXXColour etc + /* called by SetFont() and SetXXXColour etc */ void SetWidgetStyle(); - // overridden in many GTK widgets + /* overridden in many GTK widgets */ virtual void ApplyWidgetStyle(); #if wxUSE_TOOLTIPS @@ -162,11 +163,11 @@ public: int m_x, m_y; int m_width, m_height; - // see the docs in src/gtk/window.cpp + /* see the docs in src/gtk/window.cpp */ GtkWidget *m_widget; GtkWidget *m_wxwindow; - // scrolling stuff + /* scrolling stuff */ GtkAdjustment *m_hAdjust,*m_vAdjust; float m_oldHorizontalPos; float m_oldVerticalPos; @@ -185,6 +186,7 @@ public: bool m_sizeSet:1; bool m_resizing:1; bool m_isStaticBox:1; /* faster than IS_KIND_OF */ + bool m_isRadioButton:1; /* faster than IS_KIND_OF */ bool m_isFrame:1; /* faster than IS_KIND_OF */ bool m_acceptsFocus:1; /* ! wxStaticBox etc. */