X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a589495eeb083bee99e4c92f8ff4e12457ca82bb..7275146d4d0ee1e2b7b459c383572faec5c4f5c2:/include/wx/gtk/window.h?ds=sidebyside

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index ebc2120620..607f344c21 100644
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -80,6 +80,8 @@ public:
     virtual bool SetCursor( const wxCursor &cursor );
     virtual bool SetFont( const wxFont &font );
 
+    virtual bool SetBackgroundStyle(wxBackgroundStyle style) ;
+    
     virtual int GetCharHeight() const;
     virtual int GetCharWidth() const;
     virtual void GetTextExtent(const wxString& string,
@@ -204,7 +206,7 @@ public:
 #ifdef __WXGTK20__
     wxGtkIMData         *m_imData;
 #else
-#if HAVE_XIM
+#if HAVE_XIM && !defined(__WXGTK20__)
     // XIM support for wxWidgets
     GdkIC               *m_ic;
     GdkICAttr           *m_icattr;
@@ -238,6 +240,8 @@ public:
     bool                 m_dirtyTabOrder:1;     // tab order changed, GTK focus
                                                 // chain needs update
 #endif
+    bool                 m_needsStyleChange:1;  // May not be able to change
+                                                // background style until OnIdle
 
     // C++ has no virtual methods in the constrcutor of any class but we need
     // different methods of inserting a child window into a wxFrame,