X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a236aa2058ccf3d36e9cafc20fa7375080c4be50..985acf8734d61067c66b4812a9dd9da90d725851:/src/msw/control.cpp

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 2b4eb28cd8..857cc3325b 100644
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -226,18 +226,6 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
 // various accessors
 // ----------------------------------------------------------------------------
 
-wxBorder wxControl::GetDefaultBorder() const
-{
-    // we want to automatically give controls a sunken style (confusingly,
-    // it may not really mean sunken at all as we map it to WS_EX_CLIENTEDGE
-    // which is not sunken at all under Windows XP -- rather, just the default)
-#if defined(__POCKETPC__) || defined(__SMARTPHONE__)
-    return wxBORDER_SIMPLE;
-#else
-    return wxBORDER_SUNKEN;
-#endif
-}
-
 WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     long msStyle = wxWindow::MSWGetStyle(style, exstyle);
@@ -255,6 +243,11 @@ wxSize wxControl::DoGetBestSize() const
     return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT);
 }
 
+wxBorder wxControl::GetDefaultBorder() const
+{
+	return GetDefaultBorderForControl();
+}
+
 // This is a helper for all wxControls made with UPDOWN native control.
 // In wxMSW it was only wxSpinCtrl derived from wxSpinButton but in
 // WinCE of Smartphones this happens also for native wxTextCtrl,
@@ -448,7 +441,7 @@ void wxControlWithItems::MSWAllocStorage(const wxArrayStringsAdapter& items,
         totalTextLength += items[i].length();
     }
 
-    if ( SendMessage(MSWGetItemsHWND(), wm, numItems,
+    if ( SendMessage((HWND)MSWGetItemsHWND(), wm, numItems,
                      (LPARAM)totalTextLength*sizeof(wxChar)) == LB_ERRSPACE )
     {
         wxLogLastError(wxT("SendMessage(XX_INITSTORAGE)"));
@@ -459,7 +452,8 @@ int wxControlWithItems::MSWInsertOrAppendItem(unsigned pos,
                                               const wxString& item,
                                               unsigned wm)
 {
-    LRESULT n = SendMessage(MSWGetItemsHWND(), wm, pos, (LPARAM)item.wx_str());
+    LRESULT n = SendMessage((HWND)MSWGetItemsHWND(), wm, pos,
+                            (LPARAM)item.wx_str());
     if ( n == CB_ERR || n == CB_ERRSPACE )
     {
         wxLogLastError(wxT("SendMessage(XX_ADD/INSERTSTRING)"));