renamed RGBColor setter to avoid former overload being an override

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

diff --git a/src/mac/carbon/accel.cpp b/src/mac/carbon/accel.cpp
index 1ca16d6c292d8a0d342fddd14376749a8b7964fe..36ea09768813ba297a38ef80c01401d3491422b0 100644 (file)
--- a/src/mac/carbon/accel.cpp
+++ b/src/mac/carbon/accel.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        accel.cpp
+// Name:        src/mac/carbon/accel.cpp

 // Purpose:     wxAcceleratorTable
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxAcceleratorTable
 // Author:      Stefan Csomor
 // Modified by:


@@ -12,7 +12,10 @@
 #include "wx/wxprec.h"
 
 #include "wx/accel.h"
 #include "wx/wxprec.h"
 
 #include "wx/accel.h"

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

 
 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
 


@@ -99,5 +102,3 @@ int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
 
     return -1;
 }
 
     return -1;
 }

-
-