TestDestroy() is not const any more (warnings suppressed)

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

diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h
index d3951cf46449259d7c148feff4be63c3eca5b96a..f7ca89a62db4cf7d3556319821000bbdee98f51c 100644 (file)
--- a/include/wx/gtk1/window.h
+++ b/include/wx/gtk1/window.h
@@ -32,6 +32,12 @@
 extern const char *wxFrameNameStr;
 extern wxList wxTopLevelWindows;
 
+//-----------------------------------------------------------------------------
+// global function
+//-----------------------------------------------------------------------------
+
+wxWindow* wxGetActiveWindow();
+
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
@@ -42,11 +48,11 @@ class wxDC;
 class wxClientData;
 class wxVoidClientData;
 class wxWindow;
-#ifdef wxUSE_WX_RESOURCES
+#if wxUSE_WX_RESOURCES
 class wxResourceTable;
 class wxItemResource;
 #endif
-#ifdef wxUSE_DRAG_AND_DROP
+#if wxUSE_DRAG_AND_DROP
 class wxDropTarget;
 #endif
 
@@ -171,7 +177,6 @@ public:
   { wxPoint pt(ConvertDialogToPixels(wxPoint(sz.x, sz.y))); return wxSize(pt.x, pt.y); }
 
   void OnSize( wxSizeEvent &event );
-  void OnIdle( wxIdleEvent& event );
 
   virtual bool Show( bool show );
   virtual void Enable( bool enable );
@@ -266,6 +271,7 @@ public:
   virtual wxString GetLabel() const;
 
   void OnSysColourChanged( wxSysColourChangedEvent &WXUNUSED(event) ) {};
+  void OnKeyDown( wxKeyEvent &event );
 
   virtual bool IsShown() const;
 
@@ -290,7 +296,7 @@ public:
 
   virtual bool PopupMenu( wxMenu *menu, int x, int y );
 
-#ifdef wxUSE_DRAG_AND_DROP
+#if wxUSE_DRAG_AND_DROP
   virtual void SetDropTarget( wxDropTarget *dropTarget );
   virtual wxDropTarget *GetDropTarget() const;
 #endif
@@ -309,22 +315,24 @@ public:
 
   // implementation
 
-          void        PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos,
-                                   const wxSize &size, long style, const wxString &name );
-          void        PostCreation();
-  virtual GtkWidget  *GetConnectWidget();
-  virtual bool        IsOwnGtkWindow( GdkWindow *window );
-          void        ConnectWidget( GtkWidget *widget );
-
-          bool        HasVMT();
+  void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos,
+                    const wxSize &size, long style, const wxString &name );
+  void PostCreation();
+  
+  virtual GtkWidget* GetConnectWidget();
+  virtual bool IsOwnGtkWindow( GdkWindow *window );
+  void ConnectWidget( GtkWidget *widget );
 
-  virtual wxPoint     GetClientAreaOrigin() const;
-  virtual void        AdjustForParentClientOrigin( int& x, int& y, int sizeFlags );
+  bool HasVMT();
 
-          GtkStyle   *GetWidgetStyle();
-          void        SetWidgetStyle();
-  virtual void        ApplyWidgetStyle();
+  virtual wxPoint GetClientAreaOrigin() const;
+  virtual void AdjustForParentClientOrigin( int& x, int& y, int sizeFlags );
 
+  GtkStyle *GetWidgetStyle();
+  void SetWidgetStyle();
+  virtual void ApplyWidgetStyle();
+  
+  virtual void OnInternalIdle();
 
   wxWindow            *m_parent;
   wxList               m_children;
@@ -335,7 +343,7 @@ public:
   int                  m_retCode;
   wxEvtHandler        *m_eventHandler;
   wxValidator         *m_windowValidator;
-#ifdef wxUSE_DRAG_AND_DROP
+#if wxUSE_DRAG_AND_DROP
   wxDropTarget        *m_dropTarget;
 #endif
   wxWindowID           m_windowId;