a warning in the release build suppressed

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

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index 0bba97659229d5db7c2a5bc9d67438db1925b1e1..84a3ddcddf581facc3868b632657a4917046eab9 100644 (file)
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -152,7 +152,7 @@ class wxWindow: public wxEvtHandler
     
     void OnSysColourChanged( wxSysColourChangedEvent &WXUNUSED(event) ) {};
     
     
     void OnSysColourChanged( wxSysColourChangedEvent &WXUNUSED(event) ) {};
     

-    virtual bool IsShown(void);
+    virtual bool IsShown(void) const;

     virtual bool IsRetained(void);
     virtual wxWindow *FindWindow( long id );
     virtual wxWindow *FindWindow( const wxString& name );
     virtual bool IsRetained(void);
     virtual wxWindow *FindWindow( long id );
     virtual wxWindow *FindWindow( const wxString& name );


@@ -170,14 +170,17 @@ class wxWindow: public wxEvtHandler
     virtual void SetDropTarget( wxDropTarget *dropTarget );
     virtual wxDropTarget *GetDropTarget() const;
     
     virtual void SetDropTarget( wxDropTarget *dropTarget );
     virtual wxDropTarget *GetDropTarget() const;
     

-    virtual void SetScrollbar( int orient, int pos, int thumbVisible,
-      int range, bool refresh = TRUE );
-    virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
-    virtual int GetScrollPos( int orient ) const;
-    virtual int GetScrollThumb( int orient ) const;
-    virtual int GetScrollRange( int orient ) const;
-    virtual void ScrollWindow( int dx, int dy, const wxRect* rect = NULL );
-
+    virtual void SetScrollbar( const int orient, const int pos, const int thumbVisible,
+      const int range, const bool refresh = TRUE );
+    virtual void SetScrollPos( const int orient, const int pos, const bool refresh = TRUE );
+    virtual int GetScrollPos( const int orient ) const;
+    virtual int GetScrollThumb( const int orient ) const;
+    virtual int GetScrollRange( const int orient ) const;
+    virtual void ScrollWindow( const int dx, const int dy, const wxRect* rect = NULL );
+    
+    // return FALSE from here if the window doesn't want the focus
+    virtual bool AcceptsFocus() const;
+    

   public:         // cannot get private going yet
     
     void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos, 
   public:         // cannot get private going yet
     
     void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos, 


@@ -219,6 +222,7 @@ class wxWindow: public wxEvtHandler
     bool            m_hasScrolling;
     bool            m_hasVMT;
     bool            m_sizeSet;
     bool            m_hasScrolling;
     bool            m_hasVMT;
     bool            m_sizeSet;

+    bool            m_resizing;

     
   public:  // Layout section
   
     
   public:  // Layout section