fix warning about unused variable in release build by using standard wxLogLastError...

[wxWidgets.git] / src / mgl / utils.cpp

diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp
index 34930515dfa180e623aff83bad7d452cb668a264..b62f4b02ec986073988b3efe54c13ebaa6dd1199 100644 (file)
--- a/src/mgl/utils.cpp
+++ b/src/mgl/utils.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        utils.cpp
+// Name:        src/mgl/utils.cpp

 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$


@@ -15,10 +15,14 @@
 #endif
 
 #include "wx/utils.h"
 #endif
 
 #include "wx/utils.h"

-#include "wx/string.h"

 
 

-#include "wx/intl.h"
-#include "wx/log.h"
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+#endif
+
+#include "wx/apptrait.h"

 #include "wx/process.h"
 
 #include <stdarg.h>
 #include "wx/process.h"
 
 #include <stdarg.h>


@@ -38,129 +42,30 @@
 // misc.
 //----------------------------------------------------------------------------
 
 // misc.
 //----------------------------------------------------------------------------
 

-void wxBell()
-{
-    // FIXME_MGL
-}
-
-
-#ifdef __DOS__
-// VS: this should be in utilsdos.cpp, but since there will hardly ever
-//     be a non-MGL MS-DOS port...
-
-void wxSleep(int nSecs)
-{
-    wxUsleep(1000 * nSecs);
-}
-
-void wxUsleep(unsigned long milliseconds)
-{
-    PM_sleep(milliseconds);
-}
-
-
-bool wxGetEnv(const wxString& var, wxString *value)
-{
-    // wxGetenv is defined as getenv()
-    wxChar *p = wxGetenv(var);
-    if ( !p )
-        return FALSE;
-
-    if ( value )
-        *value = p;
-
-    return TRUE;
-}
-
-bool wxSetEnv(const wxString& variable, const wxChar *value)
-{
-    wxString s = variable;
-    if ( value )
-        s << _T('=') << value;
-
-    // transform to ANSI
-    const char *p = s.mb_str();
-
-    // the string will be free()d by libc
-    char *buf = (char *)malloc(strlen(p) + 1);
-    strcpy(buf, p);
-
-    return putenv(buf) == 0;
-}
-
-const wxChar* wxGetHomeDir(wxString *home)
-{
-    *home = wxT(".");
-    return home->c_str();
-}
-
-const wxChar* wxGetUserHomeDir(wxString *home)
-{
-    *home = wxT(".");
-    return home->c_str();
-}
-
-#if wxUSE_UNICODE
-const wxMB2WXbuf wxGetUserHome(const wxString &user)
-#else // just for binary compatibility -- there is no 'const' here
-wxChar *wxGetUserHome(const wxString &user)
-#endif
-{
-    return wxT(".");
-}
-
-void wxFatalError(const wxString &msg, const wxString &title)
-{
-    if (!title.IsNull()) 
-        wxFprintf( stderr, wxT("%s "), WXSTRINGCAST(title));
-    PM_fatalError(msg.c_str());
-}
-
-bool wxGetUserId(wxChar *WXUNUSED(buf), int WXUNUSED(sz))
+// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
+wxMemorySize wxGetFreeMemory()

 {
 {

-    wxFAIL_MSG( wxT("wxGetUserId not implemented under MS-DOS!") );
-    return FALSE;
+    // TODO - probably should be extracted to
+    //        src/msdos/utilsdos.cpp and src/unix/utilsunx.cpp
+    //        to avoid code duplication
+    return -1;

 }
 
 }
 

-bool wxGetUserName(wxChar *WXUNUSED(buf), int WXUNUSED(sz))
-{
-    wxFAIL_MSG( wxT("wxGetUserName not implemented under MS-DOS!") );
-    return FALSE;
-}
-
-bool wxGetHostName(wxChar *WXUNUSED(buf), int WXUNUSED(sz))
+void wxBell()

 {
 {

-    wxFAIL_MSG( wxT("wxGetHostName not implemented under MS-DOS!") );
-    return FALSE;
+    // FIXME_MGL

 }
 
 }
 

-bool wxGetFullHostName(wxChar *WXUNUSED(buf), int WXUNUSED(sz))
+bool wxGetKeyState(wxKeyCode key)

 {
 {

-    wxFAIL_MSG( wxT("wxGetFullHostName not implemented under MS-DOS!") );
-    return FALSE;
-}
+    wxASSERT_MSG(key != WXK_LBUTTON && key != WXK_RBUTTON && key !=
+        WXK_MBUTTON, wxT("can't use wxGetKeyState() for mouse buttons"));

 
 

-int wxKill(long WXUNUSED(pid), wxSignal WXUNUSED(sig), wxKillError *WXUNUSED(rc))
-{
-    wxFAIL_MSG( wxT("wxKill not implemented under MS-DOS!") );
-    return 0;
-}
+    // TODO

 
 

-long wxExecute(const wxString& WXUNUSED(command), bool WXUNUSED(sync), wxProcess *WXUNUSED(process))
-{
-    wxFAIL_MSG( wxT("wxExecute not implemented under MS-DOS!") );
-    return 0;
+    return false;

 }
 
 }
 

-long wxExecute(wxChar **WXUNUSED(argv), bool WXUNUSED(sync), wxProcess *WXUNUSED(process))
-{
-    wxFAIL_MSG( wxT("wxExecute not implemented under MS-DOS!") );
-    return 0;
-}
-
-
-#endif
-

 // ----------------------------------------------------------------------------
 // display characterstics
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // display characterstics
 // ----------------------------------------------------------------------------


@@ -177,11 +82,11 @@ void wxDisplaySizeMM(int *width, int *height)
     wxASSERT_MSG( g_displayDC, wxT("You must call wxApp::SetDisplayMode before using this function") );
 
     int xDPI, yDPI;
     wxASSERT_MSG( g_displayDC, wxT("You must call wxApp::SetDisplayMode before using this function") );
 
     int xDPI, yDPI;

-    MGL_getDotsPerInch(&xDPI, &yDPI);    
-    
-    if ( width ) 
+    MGL_getDotsPerInch(&xDPI, &yDPI);
+
+    if ( width )

         *width = (int)((g_displayDC->sizex()+1) * 25.4 / xDPI);
         *width = (int)((g_displayDC->sizex()+1) * 25.4 / xDPI);

-    if ( height ) 
+    if ( height )

         *height = (int)((g_displayDC->sizey()+1) * 25.4 / yDPI);
 }
 
         *height = (int)((g_displayDC->sizey()+1) * 25.4 / yDPI);
 }
 


@@ -196,7 +101,7 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 bool wxColourDisplay()
 {
     wxASSERT_MSG( g_displayDC, wxT("You must call wxApp::SetDisplayMode before using this function") );
 bool wxColourDisplay()
 {
     wxASSERT_MSG( g_displayDC, wxT("You must call wxApp::SetDisplayMode before using this function") );

-    
+

     return (wxDisplayDepth() > 1);
 }
 
     return (wxDisplayDepth() > 1);
 }
 


@@ -207,26 +112,15 @@ int wxDisplayDepth()
     return g_displayDC->getBitsPerPixel();
 }
 
     return g_displayDC->getBitsPerPixel();
 }
 

-int wxGetOsVersion(int *majorVsn, int *minorVsn)
+wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const

 {
 {

-    if ( majorVsn )
-        *majorVsn = MGL_RELEASE_MAJOR;
-    if ( minorVsn )
-        *minorVsn = MGL_RELEASE_MINOR;
-
-#if defined(__UNIX__)
-    return wxMGL_UNIX;
-#elif defined(__OS2__)
-    return wxMGL_OS2;
-#elif defined(__WIN32__)
-    return wxMGL_WIN32;
-#elif defined(__DOS__)
-    return wxMGL_DOS;
-#else
-    #error Platform not supported by wxMGL!
-#endif
-}
+    if ( verMaj )
+        *verMaj = MGL_RELEASE_MAJOR;
+    if ( verMin )
+        *verMin = MGL_RELEASE_MINOR;

 
 

+    return wxPORT_MGL;
+}

 
 void wxGetMousePosition(int* x, int* y)
 {
 
 void wxGetMousePosition(int* x, int* y)
 {


@@ -240,6 +134,28 @@ wxPoint wxGetMousePosition()
     return pt;
 }
 
     return pt;
 }
 

+wxMouseState wxGetMouseState()
+{
+    wxMouseState ms;
+    int x, y;
+
+    wxGetMousePosition(&x, &y);
+
+    ms.SetX(x);
+    ms.SetY(y);
+
+    extern unsigned long g_buttonState;
+    ms.SetLeftDown(g_buttonState & EVT_LEFTBUT);
+    ms.SetMiddleDown(g_buttonState & EVT_MIDDLEBUT);
+    ms.SetRightDown(g_buttonState & EVT_RIGHTBUT);
+
+    ms.SetControlDown(EVT_isKeyDown(KB_leftCtrl) || EVT_isKeyDown(KB_rightCtrl));
+    ms.SetShiftDown(EVT_isKeyDown(KB_leftShift) || EVT_isKeyDown(KB_rightShift));
+    ms.SetAltDown(EVT_isKeyDown(KB_leftAlt));
+    ms.SetMetaDown(EVT_isKeyDown(KB_rightAlt));
+
+    return ms;
+}

 
 
 #ifdef __UNIX__
 
 
 #ifdef __UNIX__