X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/68dda78574c865bd5bec89fbf4c8c3607b0912db..3efb01df7b4f5d6adb165119aa219c9ffde3cf42:/include/wx/gtk/window.h?ds=sidebyside diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h index e7438063b8..20c067a48c 100644 --- a/include/wx/gtk/window.h +++ b/include/wx/gtk/window.h @@ -236,13 +236,14 @@ public: void ConnectWidget( GtkWidget *widget ); void ConnectDnDWidget( GtkWidget *widget ); void DisconnectDnDWidget( GtkWidget *widget ); - + void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, long style, const wxString &name ); void PostCreation(); bool HasVMT(); virtual void ImplementSetSize(); virtual void ImplementSetPosition(); + GtkStyle *GetWidgetStyle(); wxWindow *m_parent; wxList m_children; @@ -274,10 +275,11 @@ public: bool m_needParent; bool m_hasScrolling; bool m_isScrolling; - bool m_hasOwnStyle; bool m_hasVMT; bool m_sizeSet; bool m_resizing; + GdkGC *m_scrollGC; + GtkStyle *m_widgetStyle; public: @@ -315,11 +317,6 @@ public: virtual void GetClientSizeConstraint(int *w, int *h) const ; virtual void GetPositionConstraint(int *x, int *y) const ; -protected: - // set background colour for arbitrary window (useful because some windows - // don't work with m_wxwindow, e.g. wxTextCtrl) - void SetBackgroundColourHelper( const wxColour &colour, GdkWindow *window ); - private: DECLARE_EVENT_TABLE() };