mac cgcolor changes & cleanup

[wxWidgets.git] / include / wx / mac / carbon / control.h

diff --git a/include/wx/mac/carbon/control.h b/include/wx/mac/carbon/control.h
index 201ce9f0edb547c6909360770c215f737f2aed72..41b9ddc2cce6d3e22df10bd1bc4ebf86ffd434d6 100644 (file)
--- a/include/wx/mac/carbon/control.h
+++ b/include/wx/mac/carbon/control.h
@@ -12,11 +12,7 @@
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "control.h"
-#endif
-
-WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr;
+WXDLLEXPORT_DATA(extern const char) wxControlNameStr[];
 
 // General item class
 class WXDLLEXPORT wxControl : public wxControlBase
@@ -25,16 +21,16 @@ class WXDLLEXPORT wxControl : public wxControlBase
 
 public:
    wxControl();
-   wxControl(wxWindow *parent, wxWindowID id,
+   wxControl(wxWindow *parent, wxWindowID winid,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize, long style = 0,
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxControlNameStr)
     {
-        Create(parent, id, pos, size, style, validator, name);
+        Create(parent, winid, pos, size, style, validator, name);
     }
 
-    bool Create(wxWindow *parent, wxWindowID id,
+    bool Create(wxWindow *parent, wxWindowID winid,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize, long style = 0,
             const wxValidator& validator = wxDefaultValidator,