added wxLog::ClearTraceMasks()

[wxWidgets.git] / include / wx / gtk1 / window.h

diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h
index 9f255ab617575442859f59acedcf40fadacc9379..914a9a045a667bcd578af88e35be517993c15754 100644 (file)
--- a/include/wx/gtk1/window.h
+++ b/include/wx/gtk1/window.h
@@ -106,12 +106,6 @@ public:
 
     virtual WXWidget GetHandle() const { return m_widget; }
 
-    // also sets the global flag
-    void SetScrolling(bool scroll);
-
-    bool HasScrolling() const { return m_hasScrolling; }
-    bool IsScrolling() const { return m_isScrolling; }
-
     /* I don't want users to override what's done in idle so everything that
        has to be done in idle time in order for wxGTK to work is done in
        OnInternalIdle */
@@ -157,38 +151,47 @@ public:
     // called from GTK signales handlers. it indicates that
     // the layouting functions have to be called later on
     // (i.e. in idle time, implemented in OnInternalIdle() ).
-    void UpdateSize() { m_sizeSet = FALSE; }
+    void GtkUpdateSize() { m_sizeSet = FALSE; }
 
     // position and size of the window
     int                  m_x, m_y;
     int                  m_width, m_height;
+    int                  m_oldClientWidth,m_oldClientHeight;
 
     /* see the docs in src/gtk/window.cpp */
     GtkWidget           *m_widget;
     GtkWidget           *m_wxwindow;
 
+#if HAVE_XIM
+    /* XIM support for wxWindows */
+    GdkIC               *m_ic;
+    GdkICAttr           *m_icattr;
+#endif
+    
     /* scrolling stuff */
     GtkAdjustment       *m_hAdjust,*m_vAdjust;
     float                m_oldHorizontalPos;
     float                m_oldVerticalPos;
 
     // extra (wxGTK-specific) flags
-    bool                 m_needParent:1;    /* ! wxFrame, wxDialog, wxNotebookPage ?  */
-    bool                 m_noExpose:1;      /* wxGLCanvas has its own redrawing */
+    bool                 m_needParent:1;        /* ! wxFrame, wxDialog, wxNotebookPage ?  */
+    bool                 m_noExpose:1;          /* wxGLCanvas has its own redrawing */
+    bool                 m_nativeSizeEvent:1;   /* wxGLCanvas sends wxSizeEvent upon "alloc_size" */
     bool                 m_hasScrolling:1;
-    bool                 m_isScrolling:1;
     bool                 m_hasVMT:1;
     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;  /* not wxStaticBox, not wxStaticBitmap etc.  */
+    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;   /* not wxStaticBox, not wxStaticBitmap etc.  */
+    bool                 m_isScrolling;
+    bool                 m_clipPaintRegion;  /* TRUE after ScrollWindow() */
+    bool                 m_queuedFullRedraw; /* 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_delayedFont:1;
     bool                 m_delayedForegroundColour:1;
     bool                 m_delayedBackgroundColour:1;
     
@@ -213,6 +216,7 @@ public:
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetClientSize(int width, int height);
+    virtual void DoMoveWindow(int x, int y, int width, int height);
 
 #if wxUSE_TOOLTIPS
     virtual void DoSetToolTip( wxToolTip *tip );