Added

    wxPoint ClientToScreen(const wxPoint& pt)
    wxPoint ScreenToClient(const wxPoint& pt)

back into class wxWindow

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index beb38b7c4b6212dab7b8d537a31f93bd2229802b..c4d7073bd2d3ee4e26e07e0409a6613941ccc07d 100644 (file)
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -88,6 +88,10 @@ public:
 
     virtual void ClientToScreen( int *x, int *y ) const;
     virtual void ScreenToClient( int *x, int *y ) const;
 
     virtual void ClientToScreen( int *x, int *y ) const;
     virtual void ScreenToClient( int *x, int *y ) const;

+    wxPoint ClientToScreen(const wxPoint& pt) const
+        { int x = pt.x; int y = pt.y; ClientToScreen(& x, & y); return wxPoint(x, y); }
+    wxPoint ScreenToClient(const wxPoint& pt) const
+        { int x = pt.x; int y = pt.y; ScreenToClient(& x, & y); return wxPoint(x, y); }

 
     virtual bool PopupMenu( wxMenu *menu, int x, int y );
 
 
     virtual bool PopupMenu( wxMenu *menu, int x, int y );
 


@@ -148,10 +152,10 @@ public:
     // creates a new widget style if none is there
     // and sets m_widgetStyle to this value.
     GtkStyle *GetWidgetStyle();
     // creates a new widget style if none is there
     // and sets m_widgetStyle to this value.
     GtkStyle *GetWidgetStyle();

-    
+

     // called by SetFont() and SetXXXColour etc
     void SetWidgetStyle();
     // called by SetFont() and SetXXXColour etc
     void SetWidgetStyle();

-    
+

     // overridden in many GTK widgets
     virtual void ApplyWidgetStyle();
 
     // overridden in many GTK widgets
     virtual void ApplyWidgetStyle();
 


@@ -193,7 +197,7 @@ public:
     bool                 m_isStaticBox:1;   /* faster than IS_KIND_OF */
     bool                 m_isFrame:1;       /* faster than IS_KIND_OF */
     bool                 m_acceptsFocus:1;  /* ! wxStaticBox etc.  */
     bool                 m_isStaticBox:1;   /* faster than IS_KIND_OF */
     bool                 m_isFrame:1;       /* faster than IS_KIND_OF */
     bool                 m_acceptsFocus:1;  /* ! wxStaticBox etc.  */

-    
+

     // these are true if the style were set before the widget was realized
     // (typcally in the constructor) but the actual GTK style must not be set
     // before the widget has been "realized"
     // these are true if the style were set before the widget was realized
     // (typcally in the constructor) but the actual GTK style must not be set
     // before the widget has been "realized"

diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h
index beb38b7c4b6212dab7b8d537a31f93bd2229802b..c4d7073bd2d3ee4e26e07e0409a6613941ccc07d 100644 (file)
--- a/include/wx/gtk1/window.h
+++ b/include/wx/gtk1/window.h
@@ -88,6 +88,10 @@ public:
 
     virtual void ClientToScreen( int *x, int *y ) const;
     virtual void ScreenToClient( int *x, int *y ) const;
 
     virtual void ClientToScreen( int *x, int *y ) const;
     virtual void ScreenToClient( int *x, int *y ) const;

+    wxPoint ClientToScreen(const wxPoint& pt) const
+        { int x = pt.x; int y = pt.y; ClientToScreen(& x, & y); return wxPoint(x, y); }
+    wxPoint ScreenToClient(const wxPoint& pt) const
+        { int x = pt.x; int y = pt.y; ScreenToClient(& x, & y); return wxPoint(x, y); }

 
     virtual bool PopupMenu( wxMenu *menu, int x, int y );
 
 
     virtual bool PopupMenu( wxMenu *menu, int x, int y );
 


@@ -148,10 +152,10 @@ public:
     // creates a new widget style if none is there
     // and sets m_widgetStyle to this value.
     GtkStyle *GetWidgetStyle();
     // creates a new widget style if none is there
     // and sets m_widgetStyle to this value.
     GtkStyle *GetWidgetStyle();

-    
+

     // called by SetFont() and SetXXXColour etc
     void SetWidgetStyle();
     // called by SetFont() and SetXXXColour etc
     void SetWidgetStyle();

-    
+

     // overridden in many GTK widgets
     virtual void ApplyWidgetStyle();
 
     // overridden in many GTK widgets
     virtual void ApplyWidgetStyle();
 


@@ -193,7 +197,7 @@ public:
     bool                 m_isStaticBox:1;   /* faster than IS_KIND_OF */
     bool                 m_isFrame:1;       /* faster than IS_KIND_OF */
     bool                 m_acceptsFocus:1;  /* ! wxStaticBox etc.  */
     bool                 m_isStaticBox:1;   /* faster than IS_KIND_OF */
     bool                 m_isFrame:1;       /* faster than IS_KIND_OF */
     bool                 m_acceptsFocus:1;  /* ! wxStaticBox etc.  */

-    
+

     // these are true if the style were set before the widget was realized
     // (typcally in the constructor) but the actual GTK style must not be set
     // before the widget has been "realized"
     // these are true if the style were set before the widget was realized
     // (typcally in the constructor) but the actual GTK style must not be set
     // before the widget has been "realized"

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index 643d79f01d4f7857faf2a8a6dbac534a6308c1c0..7d2e8bd7a3967ae1e377fd830cb41a7f392965f0 100644 (file)
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -116,6 +116,10 @@ public:
 
     virtual void ClientToScreen( int *x, int *y ) const;
     virtual void ScreenToClient( int *x, int *y ) const;
 
     virtual void ClientToScreen( int *x, int *y ) const;
     virtual void ScreenToClient( int *x, int *y ) const;

+    wxPoint ClientToScreen(const wxPoint& pt) const
+        { int x = pt.x; int y = pt.y; ClientToScreen(& x, & y); return wxPoint(x, y); }
+    wxPoint ScreenToClient(const wxPoint& pt) const
+        { int x = pt.x; int y = pt.y; ScreenToClient(& x, & y); return wxPoint(x, y); }

 
     virtual bool PopupMenu( wxMenu *menu, int x, int y );
 
 
     virtual bool PopupMenu( wxMenu *menu, int x, int y );
 

diff --git a/include/wx/window.h b/include/wx/window.h
index b12fa1de050d3e65934ae7aa09158bc83efef4a8..78829524a6d1d302e91b32fca4082b76f1226c81 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -611,7 +611,7 @@ public:
     virtual WXWidget GetHandle() const = 0;
 
 protected:
     virtual WXWidget GetHandle() const = 0;
 
 protected:

-    // the window id - a number which uniquely identifies a window among 
+    // the window id - a number which uniquely identifies a window among

     // its siblings unless it is -1
     wxWindowID           m_windowId;
 
     // its siblings unless it is -1
     wxWindowID           m_windowId;
 


@@ -763,8 +763,8 @@ inline wxWindow *wxWindowBase::GetGrandParent() const
 // global function
 // ----------------------------------------------------------------------------
 
 // global function
 // ----------------------------------------------------------------------------
 

-extern wxWindow* WXDLLEXPORT wxGetActiveWindow();
-inline int WXDLLEXPORT NewControlId() { return wxWindowBase::NewControlId(); }
+WXDLLEXPORT extern wxWindow* wxGetActiveWindow();
+inline WXDLLEXPORT int NewControlId() { return wxWindowBase::NewControlId(); }

 
 #endif
     // _WX_WINDOW_H_BASE_
 
 #endif
     // _WX_WINDOW_H_BASE_