X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63ec432bd7b9c93961e85e871bcb31758364a634..09b895cb4a954494063eb17d3dc302a654fd99e5:/include/wx/mac/carbon/control.h?ds=sidebyside

diff --git a/include/wx/mac/carbon/control.h b/include/wx/mac/carbon/control.h
index 29001f0667..8d7f2652c3 100644
--- a/include/wx/mac/carbon/control.h
+++ b/include/wx/mac/carbon/control.h
@@ -12,25 +12,25 @@
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 
-WXDLLEXPORT_DATA(extern const wxChar) wxControlNameStr[];
+WXDLLIMPEXP_DATA_CORE(extern const char) wxControlNameStr[];
 
 // General item class
-class WXDLLEXPORT wxControl : public wxControlBase
+class WXDLLIMPEXP_CORE wxControl : public wxControlBase
 {
     DECLARE_ABSTRACT_CLASS(wxControl)
 
 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,