show native-looking (with 3D shadow) help tooltips for context help, if possible...

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

diff --git a/include/wx/utils.h b/include/wx/utils.h
index f5d087d38551108c80db19f2bb16f62276ff3bf9..c9ee2b6182dfd4dd28030b983bc8dce46d2783f3 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -54,6 +54,7 @@ class WXDLLIMPEXP_CORE wxWindowList;
 
 #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
@@ -128,12 +129,12 @@ public:
     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
-    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);
@@ -141,7 +142,7 @@ public:
     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); }
@@ -174,6 +175,9 @@ public:
     static void ClearPlatforms();
 
 private:
+
+    void Init() { m_longValue = 0; m_doubleValue = 0.0; }
+
     long                m_longValue;
     double              m_doubleValue;
     wxString            m_stringValue;
@@ -215,12 +219,12 @@ public:
     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        CmdDown() 
+    bool        CmdDown()
     {
 #if defined(__WXMAC__) || defined(__WXCOCOA__)
         return MetaDown();
@@ -240,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; }
-        
+
 private:
     wxCoord     m_x;
     wxCoord     m_y;
@@ -408,26 +412,6 @@ enum wxShutdownFlags
 // Shutdown or reboot the PC
 WXDLLIMPEXP_BASE bool wxShutdown(wxShutdownFlags wFlags);
 
-enum wxPowerType
-{
-    wxPOWER_SOCKET,
-    wxPOWER_BATTERY,
-    wxPOWER_UNKNOWN
-};
-
-WXDLLIMPEXP_BASE wxPowerType wxGetPowerType();
-
-enum wxBatteryState
-{
-    wxBATTERY_NORMAL_STATE,    // system is fully usable
-    wxBATTERY_LOW_STATE,       // start to worry
-    wxBATTERY_CRITICAL_STATE,  // save quickly
-    wxBATTERY_SHUTDOWN_STATE,  // too late
-    wxBATTERY_UNKNOWN_STATE
-};
-
-WXDLLIMPEXP_BASE wxBatteryState wxGetBatteryState();
-
 // send the given signal to the process (only NONE and KILL are supported under
 // Windows, all others mean TERM), return 0 if ok and -1 on error
 //