wxGLCanvas works again

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

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index 8e0eeacfe75af68b553e7e4a5cfaed19bc103096..a2025c9e98debb82388c14db1f2359db9e2bf710 100644 (file)
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -29,8 +29,8 @@
 // global data
 //-----------------------------------------------------------------------------
 
-extern const char *wxFrameNameStr;
-extern wxList wxTopLevelWindows;
+extern const wxChar *wxFrameNameStr;
+extern wxWindowList wxTopLevelWindows;
 
 //-----------------------------------------------------------------------------
 // global function
@@ -67,7 +67,7 @@ typedef void (*wxInsertChildFunction)( wxWindow*, wxWindow* );
 // global data
 //-----------------------------------------------------------------------------
 
-extern const char *wxPanelNameStr;
+extern const wxChar *wxPanelNameStr;
 extern const wxSize wxDefaultSize;
 extern const wxPoint wxDefaultPosition;
 
@@ -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();
@@ -442,7 +434,7 @@ public:
     virtual void ApplyWidgetStyle();
 
 #if wxUSE_TOOLTIPS
-    virtual void ApplyToolTip( GtkTooltips *tips, const char *tip );
+    virtual void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
 #endif // wxUSE_TOOLTIPS
 
     /* private member variables */
@@ -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;
 
@@ -532,6 +525,9 @@ public:
     virtual void GetPositionConstraint(int *x, int *y) const ;
 
 protected:
+    // common part of all ctors
+    void Init();
+
     // this is the virtual function to be overriden in any derived class which
     // wants to change how SetSize() or Move() works - it is called by all
     // versions of these functions in the base class