correct access for virtuals, other minor corrections

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

diff --git a/include/wx/utils.h b/include/wx/utils.h
index b84f78f44f4b6fb17003dc37333d4caef8e4b807..40305e40445f84272d4abb1e00edd7299c0f8473 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -19,6 +19,9 @@
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/filefn.h"
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/filefn.h"

+#if wxUSE_GUI
+    #include "wx/gdicmn.h"
+#endif

 
 class WXDLLIMPEXP_BASE wxArrayString;
 class WXDLLIMPEXP_BASE wxArrayInt;
 
 class WXDLLIMPEXP_BASE wxArrayString;
 class WXDLLIMPEXP_BASE wxArrayInt;


@@ -44,7 +47,6 @@ class WXDLLIMPEXP_CORE wxProcess;
 class WXDLLIMPEXP_CORE wxFrame;
 class WXDLLIMPEXP_CORE wxWindow;
 class WXDLLIMPEXP_CORE wxWindowList;
 class WXDLLIMPEXP_CORE wxFrame;
 class WXDLLIMPEXP_CORE wxWindow;
 class WXDLLIMPEXP_CORE wxWindowList;

-class WXDLLIMPEXP_CORE wxPoint;

 
 // ----------------------------------------------------------------------------
 // Macros
 
 // ----------------------------------------------------------------------------
 // Macros


@@ -52,6 +54,7 @@ class WXDLLIMPEXP_CORE wxPoint;
 
 #define wxMax(a,b)            (((a) > (b)) ? (a) : (b))
 #define wxMin(a,b)            (((a) < (b)) ? (a) : (b))
 
 #define wxMax(a,b)            (((a) > (b)) ? (a) : (b))
 #define wxMin(a,b)            (((a) < (b)) ? (a) : (b))

+#define wxClip(a,b,c)         (((a) < (b)) ? (b) : (((a) > (c)) ? (c) : (a)))

 
 // wxGetFreeMemory can return huge amount of memory on 32-bit platforms as well
 // so to always use long long for its result type on all platforms which
 
 // wxGetFreeMemory can return huge amount of memory on 32-bit platforms as well
 // so to always use long long for its result type on all platforms which


@@ -126,12 +129,12 @@ public:
     wxPlatform(const wxPlatform& platform) { Copy(platform); }
     void operator = (const wxPlatform& platform) { Copy(platform); }
     void Copy(const wxPlatform& platform);
     wxPlatform(const wxPlatform& platform) { Copy(platform); }
     void operator = (const wxPlatform& platform) { Copy(platform); }
     void Copy(const wxPlatform& platform);

-    void Init() { m_longValue = 0; m_doubleValue = 0.0; }

 
     // Specify an optional default value
 
     // Specify an optional default value

-    wxPlatform(long defValue) { m_longValue = defValue; m_doubleValue = 0.0; }
-    wxPlatform(const wxString& defValue) { m_stringValue = defValue; m_longValue = 0; m_doubleValue = 0.0; }
-    wxPlatform(double defValue) { m_longValue = 0; m_doubleValue = defValue; }
+    wxPlatform(int defValue) { Init(); m_longValue = (long)defValue; }
+    wxPlatform(long defValue) { Init(); m_longValue = defValue; }
+    wxPlatform(const wxString& defValue) { Init(); m_stringValue = defValue; }
+    wxPlatform(double defValue) { Init(); m_doubleValue = defValue; }

 
     static wxPlatform If(int platform, long value);
     static wxPlatform IfNot(int platform, long value);
 
     static wxPlatform If(int platform, long value);
     static wxPlatform IfNot(int platform, long value);


@@ -139,7 +142,7 @@ public:
     wxPlatform& ElseIfNot(int platform, long value);
     wxPlatform& Else(long value);
 
     wxPlatform& ElseIfNot(int platform, long value);
     wxPlatform& Else(long value);
 

-    static wxPlatform If(int platform, int value);
+    static wxPlatform If(int platform, int value) { return If(platform, (long)value); }

     static wxPlatform IfNot(int platform, int value) { return IfNot(platform, (long)value); }
     wxPlatform& ElseIf(int platform, int value) { return ElseIf(platform, (long) value); }
     wxPlatform& ElseIfNot(int platform, int value) { return ElseIfNot(platform, (long) value); }
     static wxPlatform IfNot(int platform, int value) { return IfNot(platform, (long)value); }
     wxPlatform& ElseIf(int platform, int value) { return ElseIf(platform, (long) value); }
     wxPlatform& ElseIfNot(int platform, int value) { return ElseIfNot(platform, (long) value); }


@@ -172,6 +175,9 @@ public:
     static void ClearPlatforms();
 
 private:
     static void ClearPlatforms();
 
 private:

+
+    void Init() { m_longValue = 0; m_doubleValue = 0.0; }
+

     long                m_longValue;
     double              m_doubleValue;
     wxString            m_stringValue;
     long                m_longValue;
     double              m_doubleValue;
     wxString            m_stringValue;


@@ -213,12 +219,12 @@ public:
     bool        LeftDown()    { return m_leftDown; }
     bool        MiddleDown()  { return m_middleDown; }
     bool        RightDown()   { return m_rightDown; }
     bool        LeftDown()    { return m_leftDown; }
     bool        MiddleDown()  { return m_middleDown; }
     bool        RightDown()   { return m_rightDown; }

-    
+

     bool        ControlDown() { return m_controlDown; }
     bool        ShiftDown()   { return m_shiftDown; }
     bool        AltDown()     { return m_altDown; }
     bool        MetaDown()    { return m_metaDown; }
     bool        ControlDown() { return m_controlDown; }
     bool        ShiftDown()   { return m_shiftDown; }
     bool        AltDown()     { return m_altDown; }
     bool        MetaDown()    { return m_metaDown; }

-    bool        CmdDown() 
+    bool        CmdDown()

     {
 #if defined(__WXMAC__) || defined(__WXCOCOA__)
         return MetaDown();
     {
 #if defined(__WXMAC__) || defined(__WXCOCOA__)
         return MetaDown();


@@ -238,7 +244,7 @@ public:
     void        SetShiftDown(bool down)   { m_shiftDown = down; }
     void        SetAltDown(bool down)     { m_altDown = down; }
     void        SetMetaDown(bool down)    { m_metaDown = down; }
     void        SetShiftDown(bool down)   { m_shiftDown = down; }
     void        SetAltDown(bool down)     { m_altDown = down; }
     void        SetMetaDown(bool down)    { m_metaDown = down; }

-        
+

 private:
     wxCoord     m_x;
     wxCoord     m_y;
 private:
     wxCoord     m_x;
     wxCoord     m_y;


@@ -614,9 +620,7 @@ private:
 // ----------------------------------------------------------------------------
 
 // Set the cursor to the busy cursor for all windows
 // ----------------------------------------------------------------------------
 
 // Set the cursor to the busy cursor for all windows

-class WXDLLEXPORT wxCursor;
-extern WXDLLEXPORT_DATA(wxCursor*) wxHOURGLASS_CURSOR;
-WXDLLEXPORT void wxBeginBusyCursor(wxCursor *cursor = wxHOURGLASS_CURSOR);
+WXDLLIMPEXP_CORE void wxBeginBusyCursor(const wxCursor *cursor = wxHOURGLASS_CURSOR);

 
 // Restore cursor to normal
 WXDLLEXPORT void wxEndBusyCursor();
 
 // Restore cursor to normal
 WXDLLEXPORT void wxEndBusyCursor();


@@ -628,7 +632,7 @@ WXDLLEXPORT bool wxIsBusy();
 class WXDLLEXPORT wxBusyCursor
 {
 public:
 class WXDLLEXPORT wxBusyCursor
 {
 public:

-    wxBusyCursor(wxCursor* cursor = wxHOURGLASS_CURSOR)
+    wxBusyCursor(const wxCursor* cursor = wxHOURGLASS_CURSOR)

         { wxBeginBusyCursor(cursor); }
     ~wxBusyCursor()
         { wxEndBusyCursor(); }
         { wxBeginBusyCursor(cursor); }
     ~wxBusyCursor()
         { wxEndBusyCursor(); }