Some compilation fixes

[wxWidgets.git] / include / wx / frame.h

diff --git a/include/wx/frame.h b/include/wx/frame.h
index 831e1227059fd759ea34be3a70a392b9d2c81d46..b8308307e4affb370a96d6ca4e3f666069272988 100644 (file)
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -85,6 +85,10 @@ public:
     // make the window modal (all other windows unresponsive)
     virtual void MakeModal(bool modal = TRUE);
 
+    // get the origin of the client area (which may be different from (0, 0)
+    // if the frame has a toolbar) in client coordinates
+    virtual wxPoint GetClientAreaOrigin() const;
+
     // menu bar functions
     // ------------------
 
@@ -190,6 +194,11 @@ protected:
     wxToolBar *m_frameToolBar;
 #endif // wxUSE_TOOLBAR
 
+    // the frame client to screen translation should take account of the
+    // toolbar which may shift the origin of the client area
+    virtual void DoClientToScreen(int *x, int *y) const;
+    virtual void DoScreenToClient(int *x, int *y) const;
+
     // the frame icon
     wxIcon m_icon;