Oh well, I'll just stuff in the rest of the Unicode changes I have made

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

diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h
index fb1b13938b9888ebc7fa44d814f3d0db5e11ae60..2a44e8d3352da9adc811c9e77b5be988ab9b6a73 100644 (file)
--- a/include/wx/gtk1/window.h
+++ b/include/wx/gtk1/window.h
@@ -30,7 +30,7 @@
 //-----------------------------------------------------------------------------
 
 extern const char *wxFrameNameStr;
-extern wxList wxTopLevelWindows;
+extern wxWindowList wxTopLevelWindows;
 
 //-----------------------------------------------------------------------------
 // global function
@@ -98,16 +98,6 @@ private:
     wxString  m_data;
 };
 
-//-----------------------------------------------------------------------------
-// (debug)
-//-----------------------------------------------------------------------------
-
-#ifdef __WXDEBUG__
-
-void debug_focus_in( GtkWidget* widget, const char* name, const char* window );
-
-#endif
-
 //-----------------------------------------------------------------------------
 // wxWindow
 //-----------------------------------------------------------------------------
@@ -413,15 +403,17 @@ public:
 
     // implementation
 
-    virtual wxPoint GetClientAreaOrigin() const;
-    virtual void AdjustForParentClientOrigin( int& x, int& y, int sizeFlags );
-
     bool HasVMT();
 
+    /* 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 */
     virtual void OnInternalIdle();
 
-    /* used by all classes in the widget creation process */
+    /* For compatibility across platforms (not in event table) */
+    void OnIdle(wxIdleEvent& WXUNUSED(event)) {};
 
+    /* used by all classes in the widget creation process */
     void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos,
             const wxSize &size, long style, const wxString &name );
     void PostCreation();
@@ -482,7 +474,7 @@ public:
     GtkAdjustment       *m_hAdjust,*m_vAdjust;
     float                m_oldHorizontalPos;
     float                m_oldVerticalPos;
-    bool                 m_needParent;
+    bool                 m_needParent;    /* ! wxFrame, wxDialog, wxNotebookPage ?  */
     bool                 m_hasScrolling;
     bool                 m_isScrolling;
     bool                 m_hasVMT;
@@ -490,8 +482,9 @@ public:
     bool                 m_resizing;
     GdkGC               *m_scrollGC;
     GtkStyle            *m_widgetStyle;
-    bool                 m_isStaticBox;
-    bool                 m_acceptsFocus;
+    bool                 m_isStaticBox;   /* faster than IS_KIND_OF */
+    bool                 m_isFrame;       /* faster than IS_KIND_OF */
+    bool                 m_acceptsFocus;  /* ! wxStaticBox etc.  */
 
     wxInsertChildFunction  m_insertCallback;