replaced wxLogDebugs() with wxLogTrace()S

[wxWidgets.git] / src / mac / carbon / joystick.cpp

diff --git a/src/mac/carbon/joystick.cpp b/src/mac/carbon/joystick.cpp
index 5a39ba118be58a1b68276499a04eed5b14e5d7a1..8136d9e59b35a08a1bd17ffc7f2e8e9e0000a983 100644 (file)
--- a/src/mac/carbon/joystick.cpp
+++ b/src/mac/carbon/joystick.cpp
@@ -6,19 +6,19 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:    wxWindows licence
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "joystick.h"
 #endif
 
-#include "wx/setup.h"
-
-#include "wx/joystick.h"
+#include "wx/wxprec.h"
 
 #if wxUSE_JOYSTICK
 
+#include "wx/joystick.h"
+
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 
 // Attributes
@@ -113,7 +113,7 @@ int wxJoystick::GetProductId() const
 wxString wxJoystick::GetProductName() const
 {
     // TODO
-    return wxString("");
+    return wxString(wxT(""));
 }
 
 int wxJoystick::GetXMin() const
@@ -282,5 +282,5 @@ bool wxJoystick::ReleaseCapture()
 }
 
 #endif
-       // wxUSE_JOYSTICK
+    // wxUSE_JOYSTICK