X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/034be8882cc091cf8ca1ccdf307190ac73adfe54..c96faa7c9b1926d63a2fff32ac4508d3138a7bee:/include/wx/gtk/window.h diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h index f2a65b8fa1..a2025c9e98 100644 --- a/include/wx/gtk/window.h +++ b/include/wx/gtk/window.h @@ -29,7 +29,7 @@ // global data //----------------------------------------------------------------------------- -extern const char *wxFrameNameStr; +extern const wxChar *wxFrameNameStr; extern wxWindowList wxTopLevelWindows; //----------------------------------------------------------------------------- @@ -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; @@ -403,18 +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(); - // For compatibility across platforms (not in event table) + /* 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(); @@ -435,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 */