Changeset 2895 for trunk/src/comctl32/ipaddress.cpp

Timestamp:

Feb 25, 2000, 6:00:18 PM (26 years ago)

Author:

cbratschi

Message:

unicode and other changes

File:

• trunk/src/comctl32/ipaddress.cpp (modified) (12 diffs)

trunk/src/comctl32/ipaddress.cpp

@@ -1 @@
-/* $Id: ipaddress.cpp,v 1.1 2000-02-23 17:09:43 cbratschi Exp $ */
+/* $Id: ipaddress.cpp,v 1.2 2000-02-25 17:00:16 cbratschi Exp $ */
 /*
  * IP Address control
@@ -30 +30 @@
 #include "winbase.h"
 #include "commctrl.h"
+#include "ccbase.h"
 #include "ipaddress.h"
 //#include "heap.h"
 
 
-#define IPADDRESS_GetInfoPtr(hwnd) ((IPADDRESS_INFO *)GetWindowLongA (hwnd, 0))
-
-
-static BOOL
-IPADDRESS_SendNotify (HWND hwnd, UINT command);
+#define IPADDRESS_GetInfoPtr(hwnd) ((IPADDRESS_INFO*)getInfoPtr(hwnd))
+
+
 static BOOL
 IPADDRESS_SendIPAddressNotify (HWND hwnd, UINT field, BYTE newValue);
@@ -89 +88 @@
 
 
-    infoPtr = (IPADDRESS_INFO *)COMCTL32_Alloc (sizeof(IPADDRESS_INFO));
-    SetWindowLongA (hwnd, 0, (DWORD)infoPtr);
+    infoPtr = (IPADDRESS_INFO*)initControl(hwnd,sizeof(IPADDRESS_INFO));
+    if (!infoPtr) return (LRESULT)-1;
 
     GetClientRect (hwnd, &rcClient);
@@ -135 +134 @@
 IPADDRESS_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-        int i;
+    int i;
     IPADDRESS_INFO *infoPtr = IPADDRESS_GetInfoPtr (hwnd);
-        LPIP_SUBCLASS_INFO lpipsi=(LPIP_SUBCLASS_INFO)
+    LPIP_SUBCLASS_INFO lpipsi=(LPIP_SUBCLASS_INFO)
+
             GetPropA ((HWND)hwnd, IP_SUBCLASS_PROP);
 
@@ -145 +145 @@
         }
 
-    COMCTL32_Free (infoPtr);
+    doneControl(hwnd);
     return 0;
 }
@@ -161 +161 @@
 
     IPADDRESS_SendIPAddressNotify (hwnd, 0, 0);  /* FIXME: should use -1 */
-    IPADDRESS_SendNotify (hwnd, EN_KILLFOCUS);
+    sendCommand(hwnd,EN_KILLFOCUS);
     InvalidateRect (hwnd, NULL, TRUE);
 
@@ -207 +207 @@
 
 static BOOL
-IPADDRESS_SendNotify (HWND hwnd, UINT command)
-
-{
-//    TRACE (ipaddress, "%x\n",command);
-    return (BOOL)SendMessageA (GetParent (hwnd), WM_COMMAND,
-              MAKEWPARAM (GetWindowLongA (hwnd, GWL_ID),command), (LPARAM)hwnd);
-}
-
-
-static BOOL
 IPADDRESS_SendIPAddressNotify (HWND hwnd, UINT field, BYTE newValue)
 {
-        NMIPADDRESS nmip;
-
-//    TRACE (ipaddress, "%x %x\n",field,newValue);
-    nmip.hdr.hwndFrom = hwnd;
-    nmip.hdr.idFrom   = GetWindowLongA (hwnd, GWL_ID);
-    nmip.hdr.code     = IPN_FIELDCHANGED;
-
-        nmip.iField=field;
-        nmip.iValue=newValue;
-
-    return (BOOL)SendMessageA (GetParent (hwnd), WM_NOTIFY,
-                               (WPARAM)nmip.hdr.idFrom, (LPARAM)&nmip);
+  NMIPADDRESS nmip;
+
+  nmip.iField=field;
+  nmip.iValue=newValue;
+
+  return (BOOL)sendNotify(hwnd,IPN_FIELDCHANGED,&nmip.hdr);
 }
 
@@ -347 +331 @@
                          sprintf (buf,"%d",value);
                          SetWindowTextA (lpipsi->hwndIP[i],buf);
-                         IPADDRESS_SendNotify (hwnd, EN_CHANGE);
+                         sendCommand(hwnd,EN_CHANGE);
                 }
                 ip_address/=256;
@@ -386 +370 @@
 
         SetFocus (hwnd);
-        IPADDRESS_SendNotify (hwnd, EN_SETFOCUS);
+        sendCommand(hwnd,EN_SETFOCUS);
         IPADDRESS_SetFocusToField (hwnd, 0, 0);
 
@@ -648 +632 @@
 //              ERR (ipaddress, "unknown msg %04x wp=%08x lp=%08lx\n",
 //                   uMsg, wParam, lParam);
-            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+            return defComCtl32ProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
@@ -658 +642 @@
 {
     WNDCLASSA wndClass;
-
-//SvL: Don't check this now
-//    if (GlobalFindAtomA (WC_IPADDRESSA)) return;
 
     ZeroMemory (&wndClass, sizeof(WNDCLASSA));
@@ -677 +658 @@
 IPADDRESS_Unregister (VOID)
 {
-    if (GlobalFindAtomA (WC_IPADDRESSA))
     UnregisterClassA (WC_IPADDRESSA, (HINSTANCE)NULL);
 }