check for self-assignment in operator=

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

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index 7d8e2a90687fb510ca38fc1c51f63d33e6e7c94a..904c47fad80d0a2db082cfd05e1c6ff79ba5637a 100644 (file)
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -84,8 +84,8 @@ public:
     virtual int GetCharWidth() const;
     virtual void GetTextExtent(const wxString& string,
                                int *x, int *y,
     virtual int GetCharWidth() const;
     virtual void GetTextExtent(const wxString& string,
                                int *x, int *y,

-                               int *descent = (int *) NULL,
-                               int *externalLeading = (int *) NULL,
+                               int *descent = NULL,
+                               int *externalLeading = NULL,

                                const wxFont *theFont = (const wxFont *) NULL)
                                const;
 
                                const wxFont *theFont = (const wxFont *) NULL)
                                const;
 


@@ -96,7 +96,7 @@ public:
     virtual int GetScrollThumb( int orient ) const;
     virtual int GetScrollRange( int orient ) const;
     virtual void ScrollWindow( int dx, int dy,
     virtual int GetScrollThumb( int orient ) const;
     virtual int GetScrollRange( int orient ) const;
     virtual void ScrollWindow( int dx, int dy,

-                               const wxRect* rect = (wxRect *) NULL );
+                               const wxRect* rect = NULL );

     virtual bool ScrollLines(int lines);
     virtual bool ScrollPages(int pages);
 
     virtual bool ScrollLines(int lines);
     virtual bool ScrollPages(int pages);
 


@@ -129,9 +129,6 @@ public:
     // regularly
     virtual void OnInternalIdle();
 
     // regularly
     virtual void OnInternalIdle();
 

-    // Internal represention of Update()
-    void GtkUpdate();
-

     // For compatibility across platforms (not in event table)
     void OnIdle(wxIdleEvent& WXUNUSED(event)) {}
 
     // For compatibility across platforms (not in event table)
     void OnIdle(wxIdleEvent& WXUNUSED(event)) {}
 


@@ -139,9 +136,7 @@ public:
     bool PreCreation( wxWindowGTK *parent, const wxPoint &pos, const wxSize &size );
     void PostCreation();
 
     bool PreCreation( wxWindowGTK *parent, const wxPoint &pos, const wxSize &size );
     void PostCreation();
 

-    // Internal addition of child windows. differs from class
-    // to class not by using virtual functions but by using
-    // the m_insertCallback.
+    // Internal addition of child windows

     void DoAddChild(wxWindowGTK *child);
 
     // This methods sends wxPaintEvents to the window. It reads the
     void DoAddChild(wxWindowGTK *child);
 
     // This methods sends wxPaintEvents to the window. It reads the


@@ -168,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
     //
     // 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
     virtual bool GTKProcessEvent(wxEvent& event) const;
 
     // Map GTK widget direction of the given widget to/from wxLayoutDirection


@@ -180,7 +175,7 @@ public:
     // there is also the exception of wxMenuBar)
     virtual bool GTKNeedsParent() const { return !IsTopLevel(); }
 
     // 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();
 
     // fire off capture lost events.
     void GTKReleaseMouseAndNotify();
 


@@ -218,31 +213,25 @@ protected:
 
 public:
     // Returns the default context which usually is anti-aliased
 
 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)
 
 #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
 #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
 
     // 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)?
 
     // 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
 
     // 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;
 
     // position and size of the window
     int                  m_x, m_y;


@@ -259,6 +248,9 @@ public:
     // this widget will be queried for GTK's focus events
     GtkWidget           *m_focusWidget;
 
     // this widget will be queried for GTK's focus events
     GtkWidget           *m_focusWidget;
 

+    void GTKDisableFocusOutEvent();
+    void GTKEnableFocusOutEvent();
+

     wxGtkIMData         *m_imData;
 
 
     wxGtkIMData         *m_imData;
 
 


@@ -303,12 +295,6 @@ public:
     bool                 m_showOnIdle:1;        // postpone showing the window until idle
 
 protected:
     bool                 m_showOnIdle:1;        // postpone showing the window until idle
 
 protected:

-    // C++ has no virtual methods in the constrcutor of any class but we need
-    // different methods of inserting a child window into a wxFrame,
-    // wxMDIFrame, wxNotebook etc. this is the callback that will get used.
-    typedef void (*InsertChildFunction)(wxWindowGTK*, wxWindowGTK*);
-    InsertChildFunction m_insertCallback;
-

     // implement the base class pure virtuals
     virtual void DoClientToScreen( int *x, int *y ) const;
     virtual void DoScreenToClient( int *x, int *y ) const;
     // implement the base class pure virtuals
     virtual void DoClientToScreen( int *x, int *y ) const;
     virtual void DoScreenToClient( int *x, int *y ) const;


@@ -354,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.
     // 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
 
     // 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
 
     // 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)
 
     // set the current cursor for all GdkWindows making part of this widget
     // (see GTKGetWindow)


@@ -383,10 +369,11 @@ private:
     // return true if we scrolled, false otherwise (on error or simply if we
     // are already at the end)
     bool DoScrollByUnits(ScrollDir dir, ScrollUnit unit, int units);
     // return true if we scrolled, false otherwise (on error or simply if we
     // are already at the end)
     bool DoScrollByUnits(ScrollDir dir, ScrollUnit unit, int units);

+    virtual void AddChildGTK(wxWindowGTK* child);

 
 
     DECLARE_DYNAMIC_CLASS(wxWindowGTK)
 
 
     DECLARE_DYNAMIC_CLASS(wxWindowGTK)

-    DECLARE_NO_COPY_CLASS(wxWindowGTK)
+    wxDECLARE_NO_COPY_CLASS(wxWindowGTK);

 };
 
 #endif // _WX_GTK_WINDOW_H_
 };
 
 #endif // _WX_GTK_WINDOW_H_