Fixed missing brace in app.cpp

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

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 6d51207e7c92e4884a76dac065d0825d98b99c91..1433988261e79ea1db38e26419a8c8f3a0f57e29 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -75,6 +75,7 @@
 #include <stdarg.h>
 
 //// BEGIN for console support: VC++ only
 #include <stdarg.h>
 
 //// BEGIN for console support: VC++ only

+#ifdef __VISUALC__

 
 #include "wx/msw/msvcrt.h"
 
 
 #include "wx/msw/msvcrt.h"
 


@@ -103,6 +104,8 @@
 #  define new new(__FILE__,__LINE__)
 #  endif
 
 #  define new new(__FILE__,__LINE__)
 #  endif
 

+#endif
+  // __VISUALC__

 /// END for console support
 
 // In the WIN.INI file
 /// END for console support
 
 // In the WIN.INI file


@@ -270,7 +273,7 @@ wxShell(const wxString& command)
 }
 
 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
 }
 
 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)

-long wxGetFreeMemory(void)
+long wxGetFreeMemory()

 {
 #if defined(__WIN32__) && !defined(__BORLANDC__) && !defined(__TWIN32__)
   MEMORYSTATUS memStatus;
 {
 #if defined(__WIN32__) && !defined(__BORLANDC__) && !defined(__TWIN32__)
   MEMORYSTATUS memStatus;


@@ -287,7 +290,7 @@ static bool inTimer = FALSE;
 class wxSleepTimer: public wxTimer
 {
  public:
 class wxSleepTimer: public wxTimer
 {
  public:

-  inline void Notify(void)
+  inline void Notify()

   {
     inTimer = FALSE;
     Stop();
   {
     inTimer = FALSE;
     Stop();


@@ -296,6 +299,11 @@ class wxSleepTimer: public wxTimer
 
 static wxTimer *wxTheSleepTimer = NULL;
 
 
 static wxTimer *wxTheSleepTimer = NULL;
 

+void wxUsleep(unsigned long milliseconds)
+{
+    ::Sleep(milliseconds);
+}
+

 void wxSleep(int nSecs)
 {
 #if 0 // WIN32 hangs app
 void wxSleep(int nSecs)
 {
 #if 0 // WIN32 hangs app


@@ -318,7 +326,7 @@ void wxSleep(int nSecs)
 }
 
 // Consume all events until no more left
 }
 
 // Consume all events until no more left

-void wxFlushEvents(void)
+void wxFlushEvents()

 {
 //  wxYield();
 }
 {
 //  wxYield();
 }


@@ -357,7 +365,7 @@ void wxFatalError(const wxString& msg, const wxString& title)
 }
 
 // Emit a beeeeeep
 }
 
 // Emit a beeeeeep

-void wxBell(void)
+void wxBell()

 {
     // Removed by RD because IHMO syncronous sound is a Bad Thing.  MessageBeep
     // will do a similar thing anyway if there is no sound card...
 {
     // Removed by RD because IHMO syncronous sound is a Bad Thing.  MessageBeep
     // will do a similar thing anyway if there is no sound card...


@@ -509,44 +517,46 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
 }
 #endif // wxUSE_RESOURCES
 
 }
 #endif // wxUSE_RESOURCES
 

-// Old cursor
-static HCURSOR wxBusyCursorOld = 0;
-static int wxBusyCursorCount = 0;
+// ---------------------------------------------------------------------------
+// helper functiosn for showing a "busy" cursor
+// ---------------------------------------------------------------------------
+
+extern HCURSOR gs_wxBusyCursor = 0;     // new, busy cursor
+static HCURSOR gs_wxBusyCursorOld = 0;  // old cursor
+static int gs_wxBusyCursorCount = 0;

 
 // Set the cursor to the busy cursor for all windows
 void wxBeginBusyCursor(wxCursor *cursor)
 {
 
 // Set the cursor to the busy cursor for all windows
 void wxBeginBusyCursor(wxCursor *cursor)
 {

-  wxBusyCursorCount ++;
-  if (wxBusyCursorCount == 1)
-  {
-    wxBusyCursorOld = ::SetCursor((HCURSOR) cursor->GetHCURSOR());
-  }
-  else
-  {
-    (void)::SetCursor((HCURSOR) cursor->GetHCURSOR());
-  }
+    if ( gs_wxBusyCursorCount++ == 0 )
+    {
+        gs_wxBusyCursor = (HCURSOR)cursor->GetHCURSOR();
+        gs_wxBusyCursorOld = ::SetCursor(gs_wxBusyCursor);
+    }
+    //else: nothing to do, already set

 }
 
 // Restore cursor to normal
 }
 
 // Restore cursor to normal

-void wxEndBusyCursor(void)
+void wxEndBusyCursor()

 {
 {

-  if (wxBusyCursorCount == 0)
-    return;
+    wxCHECK_RET( gs_wxBusyCursorCount > 0,
+                 "no matching wxBeginBusyCursor() for wxEndBusyCursor()" );

 
 

-  wxBusyCursorCount --;
-  if (wxBusyCursorCount == 0)
-  {
-    ::SetCursor(wxBusyCursorOld);
-    wxBusyCursorOld = 0;
-  }
+    if ( --gs_wxBusyCursorCount == 0 )
+    {
+        ::SetCursor(gs_wxBusyCursorOld);
+
+        gs_wxBusyCursorOld = 0;
+    }

 }
 
 // TRUE if we're between the above two calls
 }
 
 // TRUE if we're between the above two calls

-bool wxIsBusy(void)
+bool wxIsBusy()

 {
 {

-  return (wxBusyCursorCount > 0);
+  return (gs_wxBusyCursorCount > 0);

 }
 
 }
 

+// ---------------------------------------------------------------------------

 const char* wxGetHomeDir(wxString *pstr)
 {
   wxString& strDir = *pstr;
 const char* wxGetHomeDir(wxString *pstr)
 {
   wxString& strDir = *pstr;


@@ -649,7 +659,8 @@ bool wxCheckForInterrupt(wxWindow *wnd)
     return TRUE;//*** temporary?
   }
   else{
     return TRUE;//*** temporary?
   }
   else{

-    wxError("wnd==NULL !!!");
+    wxFAIL_MSG("wnd==NULL !!!");
+

     return FALSE;//*** temporary?
   }
 }
     return FALSE;//*** temporary?
   }
 }


@@ -703,7 +714,7 @@ void wxGetMousePosition( int* x, int* y )
 };
 
 // Return TRUE if we have a colour display
 };
 
 // Return TRUE if we have a colour display

-bool wxColourDisplay(void)
+bool wxColourDisplay()

 {
   HDC dc = ::GetDC((HWND) NULL);
   bool flag;
 {
   HDC dc = ::GetDC((HWND) NULL);
   bool flag;


@@ -717,7 +728,7 @@ bool wxColourDisplay(void)
 }
 
 // Returns depth of screen
 }
 
 // Returns depth of screen

-int wxDisplayDepth(void)
+int wxDisplayDepth()

 {
   HDC dc = ::GetDC((HWND) NULL);
   int planes = GetDeviceCaps(dc, PLANES);
 {
   HDC dc = ::GetDC((HWND) NULL);
   int planes = GetDeviceCaps(dc, PLANES);