X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7738af5957ace396793ee291a280d5a3dbd4821f..3863c5ebd92650ba88f29db4f5f8d794ec11bf80:/include/wx/gtk/window.h

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index d5a4dd88ab..ba3f7222d9 100644
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -60,6 +60,8 @@ public:
     virtual bool IsRetained() const;
 
     virtual void SetFocus();
+
+    // hint from wx to native GTK+ tab traversal code
     virtual void SetCanFocus(bool canFocus);
 
     virtual bool Reparent( wxWindowBase *newParent );
@@ -182,6 +184,8 @@ public:
     // fire off capture lost events.
     void GTKReleaseMouseAndNotify();
 
+    GdkWindow* GTKGetDrawingWindow() const;
+
 protected:
     // Override GTKWidgetNeedsMnemonic and return true if your
     // needs to set its mnemonic widget, such as for a
@@ -233,15 +237,9 @@ public:
     // is this window transparent for the mouse events (as wxStaticBox is)?
     virtual bool IsTransparentForMouse() const { return false; }
 
-    // is this a radiobutton (used by radiobutton code itself only)?
-    virtual bool IsRadioButton() const { return false; }
-
     // Common scroll event handling code for wxWindow and wxScrollBar
     wxEventType GetScrollEventType(GtkRange* range);
 
-    void BlockScrollEvent();
-    void UnblockScrollEvent();
-
     // position and size of the window
     int                  m_x, m_y;
     int                  m_width, m_height;
@@ -253,7 +251,7 @@ public:
 
     // return true if the window is of a standard (i.e. not wxWidgets') class
     bool IsOfStandardClass() const { return m_wxwindow == NULL; }
-    
+
     // this widget will be queried for GTK's focus events
     GtkWidget           *m_focusWidget;
 
@@ -285,13 +283,10 @@ public:
     // find the direction of the given scrollbar (must be one of ours)
     ScrollDir ScrollDirFromRange(GtkRange *range) const;
 
-
     // extra (wxGTK-specific) flags
     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_hasVMT:1;
-    bool                 m_resizing:1;
     bool                 m_hasFocus:1;          // true if == FindFocus()
     bool                 m_isScrolling:1;       // dragging scrollbar thumb?
     bool                 m_clipPaintRegion:1;   // true after ScrollWindow()
@@ -301,7 +296,6 @@ public:
     bool                 m_needsStyleChange:1;  // May not be able to change
                                                 // background style until OnIdle
     bool                 m_mouseButtonDown:1;
-    bool                 m_blockScrollEvent:1;
 
     bool                 m_showOnIdle:1;        // postpone showing the window until idle
 
@@ -339,7 +333,7 @@ protected:
     // common part of all ctors (not virtual because called from ctor)
     void Init();
 
-    virtual void DoMoveInTabOrder(wxWindow *win, MoveKind move);
+    virtual void DoMoveInTabOrder(wxWindow *win, WindowOrder move);
     virtual bool DoNavigateIn(int flags);