Applied wxImage -> wxCursor patch, tool window event table fix

[wxWidgets.git] / include / wx / os2 / control.h

diff --git a/include/wx/os2/control.h b/include/wx/os2/control.h
index 19ee703ab07987d47615b11a4534fe8c8d27dc91..661efc7b06cdd6a0d7ba0772251b7311239d16d6 100644 (file)
--- a/include/wx/os2/control.h
+++ b/include/wx/os2/control.h
@@ -14,8 +14,6 @@
 
 #include "wx/dynarray.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr;
-
 // General item class
 class WXDLLEXPORT wxControl : public wxControlBase
 {
@@ -114,6 +112,16 @@ public:
 
     virtual wxSize DoGetBestSize(void) const;
 
+    bool OS2CreateControl( wxWindow*          pParent
+                          ,wxWindowID         lId
+                          ,const wxPoint&     rPos
+                          ,const wxSize&      rSize
+                          ,long               lStyle
+#if wxUSE_VALIDATORS
+                          ,const wxValidator& rValidator
+#endif
+                          ,const wxString&    rsName
+                         );
     //
     // Create the control of the given class with the given style, returns FALSE
     // if creation failed.