needed for mac port

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

diff --git a/include/wx/window.h b/include/wx/window.h
index cc2212738bcdd67cb63e71c2d639c7e4b462ba07..7d11de1b10ab5e3c28c17a3f610e32ce64be7691 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -28,6 +28,7 @@
 #include "wx/font.h"            // so we can't do without them
 #include "wx/colour.h"
 #include "wx/region.h"
 #include "wx/font.h"            // so we can't do without them
 #include "wx/colour.h"
 #include "wx/region.h"

+#include "wx/utils.h"

 
 #if wxUSE_VALIDATORS
     #include "wx/validate.h"    // defines wxDefaultValidator
 
 #if wxUSE_VALIDATORS
     #include "wx/validate.h"    // defines wxDefaultValidator


@@ -121,7 +122,11 @@ public:
                     const wxSize& size = wxDefaultSize,
                     long style = 0,
 #if wxUSE_VALIDATORS
                     const wxSize& size = wxDefaultSize,
                     long style = 0,
 #if wxUSE_VALIDATORS

+#  if defined(__VISAGECPP__)
+                    const wxValidator* validator = wxDefaultValidator,
+#  else

                     const wxValidator& validator = wxDefaultValidator,
                     const wxValidator& validator = wxDefaultValidator,

+#  endif

 #endif // wxUSE_VALIDATORS
                     const wxString& name = wxPanelNameStr);
 
 #endif // wxUSE_VALIDATORS
                     const wxString& name = wxPanelNameStr);
 


@@ -276,6 +281,11 @@ public:
                                int maxW = -1, int maxH = -1,
                                int incW = -1, int incH = -1 );
 
                                int maxW = -1, int maxH = -1,
                                int incW = -1, int incH = -1 );
 

+    int GetMinWidth() const { return m_minWidth; }
+    int GetMinHeight() const { return m_minHeight; }
+    int GetMaxWidth() const { return m_maxWidth; }
+    int GetMaxHeight() const { return m_maxHeight; }
+

     // window state
     // ------------
 
     // window state
     // ------------
 


@@ -332,7 +342,7 @@ public:
     inline wxWindow *GetGrandParent() const;
 
         // is this window a top level one?
     inline wxWindow *GetGrandParent() const;
 
         // is this window a top level one?

-    bool IsTopLevel() const;
+    virtual bool IsTopLevel() const;

 
         // it doesn't really change parent, use ReParent() instead
     void SetParent( wxWindowBase *parent ) { m_parent = (wxWindow *)parent; }
 
         // it doesn't really change parent, use ReParent() instead
     void SetParent( wxWindowBase *parent ) { m_parent = (wxWindow *)parent; }


@@ -370,7 +380,11 @@ public:
 #if wxUSE_VALIDATORS
         // a window may have an associated validator which is used to control
         // user input
 #if wxUSE_VALIDATORS
         // a window may have an associated validator which is used to control
         // user input

+#  if defined(__VISAGECPP__)
+    virtual void SetValidator( const wxValidator *validator );
+#  else

     virtual void SetValidator( const wxValidator &validator );
     virtual void SetValidator( const wxValidator &validator );

+#  endif

     virtual wxValidator *GetValidator() { return m_windowValidator; }
 #endif // wxUSE_VALIDATORS
 
     virtual wxValidator *GetValidator() { return m_windowValidator; }
 #endif // wxUSE_VALIDATORS