X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/596f1d1160c9d413dc7725676297354e24ceffbc..7686554b2508ed9f94027029703614fb684b89d6:/include/wx/gtk/window.h

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index f5c690f5bc..0a40f286cb 100644
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -115,10 +115,6 @@ public:
     // Internal represention of Update()
     void GtkUpdate();
     
-    // For delayed background 
-    void GtkSetBackgroundColour( const wxColour &colour );
-    void GtkSetForegroundColour( const wxColour &colour );
-    
     // For compatibility across platforms (not in event table)
     void OnIdle(wxIdleEvent& WXUNUSED(event)) {}
 
@@ -153,10 +149,6 @@ 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.
-    GtkStyle *GetWidgetStyle();
-
 #ifdef __WXGTK20__
     // Returns the default context which usually is anti-aliased
     PangoContext   *GtkGetPangoDefaultContext();
@@ -168,12 +160,6 @@ public:
     PangoContext   *m_x11Context;
 #endif
 
-    // Called by SetFont() and SetXXXColour etc
-    void SetWidgetStyle();
-
-    // Overridden in many GTK widgets who have to handle subwidgets
-    virtual void ApplyWidgetStyle();
-
 #if wxUSE_TOOLTIPS
     virtual void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
 #endif // wxUSE_TOOLTIPS
@@ -201,7 +187,7 @@ public:
 
     // see the docs in src/gtk/window.cpp
     GtkWidget           *m_widget;          // mostly the widget seen by the rest of GTK
-    GtkWidget           *m_wxwindow;        // mostly the client area as per wxWindows
+    GtkWidget           *m_wxwindow;        // mostly the client area as per wxWidgets
 
     // this widget will be queried for GTK's focus events
     GtkWidget           *m_focusWidget;
@@ -210,7 +196,7 @@ public:
     GtkIMMulticontext   *m_imContext;
 #else
 #if HAVE_XIM
-    // XIM support for wxWindows
+    // XIM support for wxWidgets
     GdkIC               *m_ic;
     GdkICAttr           *m_icattr;
 #endif
@@ -241,18 +227,6 @@ public:
     bool                 m_clipPaintRegion:1;   // TRUE after ScrollWindow()
     bool                 m_queuedFullRedraw:1;  // TRUE after DoMoveWindow
 
-    // These are true if the style were set before the widget was realized
-    // (typcally in the constructor) but the actual GTK style must not be set
-    // before the widget has been "realized"
-    bool                 m_delayedForegroundColour:1;
-    bool                 m_delayedBackgroundColour:1;
-
-    // Contains GTK's widgets internal information about non-default widget
-    // font and colours. we create one for each widget that gets any
-    // non-default attribute set via SetFont() or SetForegroundColour() /
-    // SetBackgroundColour().
-    GtkStyle            *m_widgetStyle;
-
     // C++ has no virtual methods in the constrcutor of any class but we need
     // different methods of inserting a child window into a wxFrame,
     // wxMDIFrame, wxNotebook etc. this is the callback that will get used.
@@ -280,6 +254,16 @@ public:
 protected:
     // common part of all ctors (not virtual because called from ctor)
     void Init();
+    
+    // Called by ApplyWidgetStyle (which is called by SetFont() and
+    // SetXXXColour etc to apply style changed to native widgets) to create
+    // modified GTK style with non-standard attributes. If forceStyle=true,
+    // creates empty GtkRcStyle if there are no modifications, otherwise
+    // returns NULL in such case.
+    GtkRcStyle *CreateWidgetStyle(bool forceStyle = false);
+
+    // Overridden in many GTK widgets who have to handle subwidgets
+    virtual void ApplyWidgetStyle(bool forceStyle = false);
 
 private:
     DECLARE_DYNAMIC_CLASS(wxWindowGTK)