X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3b9f782ef3949f583e8ac53795d36787f044fc3..cbeda384e51acb82e13994cb67ac1714669cae10:/include/wx/gtk/window.h?ds=sidebyside

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index 4d30ba2256..904c47fad8 100644
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -129,9 +129,6 @@ public:
     // regularly
     virtual void OnInternalIdle();
 
-    // Internal represention of Update()
-    void GtkUpdate();
-
     // For compatibility across platforms (not in event table)
     void OnIdle(wxIdleEvent& WXUNUSED(event)) {}
 
@@ -166,7 +163,7 @@ public:
     // override this if some events should never be consumed by wxWidgets but
     // but have to be left for the native control
     //
-    // base version just does GetEventHandler()->ProcessEvent()
+    // base version just calls HandleWindowEvent()
     virtual bool GTKProcessEvent(wxEvent& event) const;
 
     // Map GTK widget direction of the given widget to/from wxLayoutDirection
@@ -178,7 +175,7 @@ public:
     // there is also the exception of wxMenuBar)
     virtual bool GTKNeedsParent() const { return !IsTopLevel(); }
 
-    // This is called when capture is taken from the window. It will 
+    // This is called when capture is taken from the window. It will
     // fire off capture lost events.
     void GTKReleaseMouseAndNotify();
 
@@ -216,31 +213,25 @@ protected:
 
 public:
     // Returns the default context which usually is anti-aliased
-    PangoContext   *GtkGetPangoDefaultContext();
+    PangoContext   *GTKGetPangoDefaultContext();
 
 #if wxUSE_TOOLTIPS
     // applies tooltip to the widget (tip must be UTF-8 encoded)
-    virtual void ApplyToolTip( GtkTooltips *tips, const gchar *tip );
+    virtual void GTKApplyToolTip( GtkTooltips *tips, const gchar *tip );
 #endif // wxUSE_TOOLTIPS
 
     // Called when a window should delay showing itself
-    // until idle time. This partly mimmicks defered
-    // sizing under MSW.
-    void GtkShowOnIdle() { m_showOnIdle = true; }
+    // until idle time used in Reparent().
+    void GTKShowOnIdle() { m_showOnIdle = true; }
 
     // This is called from the various OnInternalIdle methods
-    bool GtkShowFromOnIdle();
-
-    // fix up the mouse event coords, used by wxListBox only so far
-    virtual void FixUpMouseEvent(GtkWidget * WXUNUSED(widget),
-                                 wxCoord& WXUNUSED(x),
-                                 wxCoord& WXUNUSED(y)) { }
+    bool GTKShowFromOnIdle();
 
     // is this window transparent for the mouse events (as wxStaticBox is)?
-    virtual bool IsTransparentForMouse() const { return false; }
+    virtual bool GTKIsTransparentForMouse() const { return false; }
 
     // Common scroll event handling code for wxWindow and wxScrollBar
-    wxEventType GetScrollEventType(GtkRange* range);
+    wxEventType GTKGetScrollEventType(GtkRange* range);
 
     // position and size of the window
     int                  m_x, m_y;
@@ -256,7 +247,7 @@ public:
 
     // this widget will be queried for GTK's focus events
     GtkWidget           *m_focusWidget;
-    
+
     void GTKDisableFocusOutEvent();
     void GTKEnableFocusOutEvent();
 
@@ -319,7 +310,6 @@ protected:
 
 #if wxUSE_MENUS_NATIVE
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
-    virtual void DoPopupMenuUpdateUI(wxMenu* menu);
 #endif // wxUSE_MENUS_NATIVE
 
     virtual void DoCaptureMouse();
@@ -350,17 +340,17 @@ protected:
     // modified GTK style with non-standard attributes. If forceStyle=true,
     // creates empty GtkRcStyle if there are no modifications, otherwise
     // returns NULL in such case.
-    GtkRcStyle *CreateWidgetStyle(bool forceStyle = false);
+    GtkRcStyle *GTKCreateWidgetStyle(bool forceStyle = false);
 
     // Overridden in many GTK widgets who have to handle subwidgets
-    virtual void ApplyWidgetStyle(bool forceStyle = false);
+    virtual void GTKApplyWidgetStyle(bool forceStyle = false);
 
     // helper function to ease native widgets wrapping, called by
     // ApplyWidgetStyle -- override this, not ApplyWidgetStyle
     virtual void DoApplyWidgetStyle(GtkRcStyle *style);
 
     // sets the border of a given GtkScrolledWindow from a wx style
-    static void GtkScrolledWindowSetBorder(GtkWidget* w, int style);
+    static void GTKScrolledWindowSetBorder(GtkWidget* w, int style);
 
     // set the current cursor for all GdkWindows making part of this widget
     // (see GTKGetWindow)
@@ -383,7 +373,7 @@ private:
 
 
     DECLARE_DYNAMIC_CLASS(wxWindowGTK)
-    DECLARE_NO_COPY_CLASS(wxWindowGTK)
+    wxDECLARE_NO_COPY_CLASS(wxWindowGTK);
 };
 
 #endif // _WX_GTK_WINDOW_H_