X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/789295bf7bd4b58b0270800fb689fce0786dae15..cd25b18c8e7e8d77b1a5847f289afec6e114fbd5:/include/wx/window.h

diff --git a/include/wx/window.h b/include/wx/window.h
index 94ea50624a..34049b6af0 100644
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -28,7 +28,10 @@
 #include "wx/font.h"            // so we can't do without them
 #include "wx/colour.h"
 #include "wx/region.h"
-#include "wx/accel.h"
+
+#if wxUSE_ACCEL
+    #include "wx/accel.h"
+#endif // wxUSE_ACCEL
 
 // ----------------------------------------------------------------------------
 // forward declarations
@@ -256,6 +259,8 @@ public:
         // centre with respect to the the parent window
     void Centre( int direction = wxHORIZONTAL );
     void Center( int direction = wxHORIZONTAL ) { Centre(direction); }
+    void CentreOnParent(int direction = wxHORIZONTAL );
+    void CenterOnParent(int direction = wxHORIZONTAL ) { CentreOnParent(direction); }
 
         // set window size to wrap around its children
     virtual void Fit();
@@ -321,7 +326,7 @@ public:
     inline wxWindow *GetGrandParent() const;
 
         // is this window a top level one?
-    bool IsTopLevel() const { return m_parent != 0; }
+    bool IsTopLevel() const;
 
         // it doesn't really change parent, use ReParent() instead
     void SetParent( wxWindowBase *parent ) { m_parent = (wxWindow *)parent; }
@@ -356,10 +361,12 @@ public:
     // validators and client data
     // --------------------------
 
+#if wxUSE_VALIDATORS
         // a window may have an associated validator which is used to control
         // user input
     virtual void SetValidator( const wxValidator &validator );
     virtual wxValidator *GetValidator() { return m_windowValidator; }
+#endif // wxUSE_VALIDATORS
 
         // each window may have associated client data: either a pointer to
         // wxClientData object in which case it is managed by the window (i.e.
@@ -389,12 +396,14 @@ public:
 
     virtual void InitDialog();
 
+#if wxUSE_ACCEL
     // accelerators
     // ------------
     virtual void SetAcceleratorTable( const wxAcceleratorTable& accel )
         { m_acceleratorTable = accel; }
     wxAcceleratorTable *GetAcceleratorTable()
         { return &m_acceleratorTable; }
+#endif // wxUSE_ACCEL
 
     // dialog units translations
     // -------------------------
@@ -522,7 +531,10 @@ public:
 
     void UpdateWindowUI();
 
-    virtual bool PopupMenu( wxMenu *menu, int x, int y ) = 0;
+    bool PopupMenu( wxMenu *menu, const wxPoint& pos )
+        { return DoPopupMenu(menu, pos.x, pos.y); }
+    bool PopupMenu( wxMenu *menu, int x, int y )
+        { return DoPopupMenu(menu, x, y); }
 
     // scrollbars
     // ----------
@@ -654,8 +666,10 @@ protected:
     // changed with SetEventHandler()
     wxEvtHandler        *m_eventHandler;
 
+#if wxUSE_VALIDATORS
     // associated validator or NULL if none
     wxValidator         *m_windowValidator;
+#endif // wxUSE_VALIDATORS
 
 #if wxUSE_DRAG_AND_DROP
     wxDropTarget        *m_dropTarget;
@@ -673,9 +687,11 @@ protected:
     // the region which should be repainted in response to paint event
     wxRegion             m_updateRegion;
 
+#if wxUSE_ACCEL
     // the accelerator table for the window which translates key strokes into
     // command events
     wxAcceleratorTable   m_acceleratorTable;
+#endif // wxUSE_ACCEL
 
     // user data associated with the window: either an object which will be
     // deleted by the window when it's deleted or some raw pointer which we do
@@ -759,6 +775,8 @@ protected:
     virtual void DoSetToolTip( wxToolTip *tip );
 #endif // wxUSE_TOOLTIPS
 
+    virtual bool DoPopupMenu( wxMenu *menu, int x, int y ) = 0;
+
 private:
     // contains the last id generated by NewControlId
     static int ms_lastControlId;