X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/015dca24cabea5750e808e7c5f9505165b023c90..3b2b40b45fd13c5fead54b7d36819b1411fdef63:/include/wx/gtk/window.h?ds=sidebyside diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h index 3ec4c2805f..e3ea31dc2f 100644 --- a/include/wx/gtk/window.h +++ b/include/wx/gtk/window.h @@ -48,7 +48,7 @@ public: // implement base class (pure) virtual methods // ------------------------------------------- - virtual void SetLabel( const wxString &label ) {} + virtual void SetLabel(const wxString& WXUNUSED(label)) { } virtual wxString GetLabel() const { return wxEmptyString; } virtual bool Destroy(); @@ -130,7 +130,7 @@ public: void OnIdle(wxIdleEvent& WXUNUSED(event)) {} // wxGTK-specific: called recursively by Enable, - // to give widgets an oppprtunity to correct their colours after they + // to give widgets an opportunity to correct their colours after they // have been changed by Enable virtual void OnParentEnable( bool WXUNUSED(enable) ) {} @@ -153,7 +153,7 @@ public: // The methods below are required because many native widgets // are composed of several subwidgets and setting a style for // the widget means setting it for all subwidgets as well. - // also, it is nor clear, which native widget is the top + // also, it is not clear which native widget is the top // widget where (most of) the input goes. even tooltips have // to be applied to all subwidgets. virtual GtkWidget* GetConnectWidget(); @@ -163,15 +163,6 @@ public: #ifdef __WXGTK20__ // Returns the default context which usually is anti-aliased PangoContext *GtkGetPangoDefaultContext(); - - // Returns the X11 context which renders on the X11 client - // side (which can be remote) and which usually is not - // anti-aliased and is thus faster - // MR: Now returns the default pango_context for the widget as GtkGetPangoDefaultContext to - // not depend on libpangox - which is completely deprecated. - //BCI: Remove GtkGetPangoX11Context and m_x11Context completely when symbols may be removed - PangoContext *GtkGetPangoX11Context(); - PangoContext *m_x11Context; // MR: Now unused #endif #if wxUSE_TOOLTIPS @@ -182,7 +173,7 @@ public: // scrolbar in sync (this does not generate any wx events) void GtkUpdateScrollbar(int orient); - // Called from GTK signales handlers. it indicates that + // Called from GTK signal handlers. it indicates that // the layouting functions have to be called later on // (i.e. in idle time, implemented in OnInternalIdle() ). void GtkUpdateSize() { m_sizeSet = false; }