Changeset 2269 for trunk/src

Timestamp:

Dec 30, 1999, 7:33:00 PM (26 years ago)

Author:

cbratschi

Message:

* empty log message *

Location:

trunk/src/user32

Files:

• Makefile (modified) (3 diffs)
• button.cpp (modified) (2 diffs)
• controls.cpp (modified) (5 diffs)
• controls.h (modified) (2 diffs)
• icontitle.cpp (added)
• menu.cpp (added)
• win32wbase.cpp (modified) (2 diffs)
• win32wbase.h (modified) (3 diffs)
• winswitch.cpp (added)

trunk/src/user32/Makefile

@@ -1 @@
-# $Id: Makefile,v 1.53 1999-12-29 12:39:43 sandervl Exp $
+# $Id: Makefile,v 1.54 1999-12-30 18:32:57 cbratschi Exp $
 
 #
@@ -38 +38 @@
         windowword.obj gen_object.obj oslibwin.obj win32wndchild.obj \
         controls.obj button.obj static.obj scroll.obj listbox.obj \
-        combo.obj edit.obj clipboard.obj winicon.obj win32wmdiclient.obj \
-        oslibutil.obj oslibmsg.obj dib.obj oslibdos.obj win32wmdichild.obj \
-        winprop.obj wingdi.obj oslibgdi.obj winaccel.obj win32wbasepos.obj \
-        oslibres.obj dummy.obj oslibmenu.obj dc.obj timer.obj \
+        combo.obj edit.obj winswitch.obj icontitle.obj clipboard.obj winicon.obj \
+        win32wmdiclient.obj oslibutil.obj oslibmsg.obj dib.obj oslibdos.obj \
+        win32wmdichild.obj winprop.obj wingdi.obj oslibgdi.obj winaccel.obj \
+        win32wbasepos.obj oslibres.obj dummy.obj oslibmenu.obj dc.obj timer.obj \
         caret.obj resource.obj winproc.obj text.obj oslibmsgtranslate.obj \
         windlgmsg.obj windlg.obj win32wdesktop.obj
@@ -112 +112 @@
 combo.obj: combo.cpp $(PDWIN32_INCLUDE)\win\combo.h initterm.h
 edit.obj: edit.cpp $(PDWIN32_INCLUDE)\win\combo.h
+menu.obj: menu.cpp $(PDWIN32_INCLUDE)\win\menu.h
+winswitch.obj: winswitch.cpp $(PDWIN32_INCLUDE)\win\winswitch.h
+icontitle.obj: icontitle.cpp $(PDWIN32_INCLUDE)\win\icontitle.h
 
 msgbox.obj:    msgbox.cpp

trunk/src/user32/button.cpp

@@ -1 @@
-/* $Id: button.cpp,v 1.27 1999-12-28 17:04:22 cbratschi Exp $ */
+/* $Id: button.cpp,v 1.28 1999-12-30 18:32:57 cbratschi Exp $ */
 /* File: button.cpp -- Button type widgets
  *
@@ -15 +15 @@
 #include <string.h>
 #include <stdlib.h>
-
 #include <os2win.h>
 #include "controls.h"

trunk/src/user32/controls.cpp

@@ -1 @@
-/* $Id: controls.cpp,v 1.5 1999-10-24 22:56:01 sandervl Exp $ */
+/* $Id: controls.cpp,v 1.6 1999-12-30 18:32:58 cbratschi Exp $ */
 /* File: controls.cpp -- Win32 common controls
  *
@@ -17 +17 @@
 #include "win32dlg.h"
 #include "win32wdesktop.h"
+#include "winswitch.h"
+#include "icontitle.h"
 #include "controls.h"
 
@@ -63 +65 @@
   dprintf(("Register DESKTOP class"));
   controlAtoms[DESKTOP_CONTROL] = DESKTOP_Register();
-  if (!controlAtoms[DESKTOP_CONTROL]) dprintf(("failed!!!")); 
+  if (!controlAtoms[DESKTOP_CONTROL]) dprintf(("failed!!!"));
+
+  dprintf(("Register WINSWITCH class"));
+  controlAtoms[WINSWITCH_CONTROL] = WINSWITCH_Register();
+  if (!controlAtoms[WINSWITCH_CONTROL]) dprintf(("failed!!!"));
+
+  dprintf(("Register ICONTITLE class"));
+  controlAtoms[ICONTITLE_CONTROL] = ICONTITLE_Register();
+  if (!controlAtoms[ICONTITLE_CONTROL]) dprintf(("failed!!!"));
 }
 
@@ -97 +107 @@
   dprintf(("Unregister DESKTOP class"));
   if (!DESKTOP_Unregister()) dprintf(("failed!!!"));
+
+  dprintf(("Unregister WINSWITCH class"));
+  if (!WINSWITCH_Unregister()) dprintf(("failed!!!"));
+
+  dprintf(("Unregister ICONTITLE class"));
+  if (!ICONTITLE_Unregister()) dprintf(("failed!!!"));
 }
 
@@ -103 +119 @@
 {
   if(control >= MAX_CONTROLS || window == NULL || window->getClass() == NULL)
-        return FALSE;
+        return FALSE;
 
   return controlAtoms[control] == window->getClass()->getAtom();

trunk/src/user32/controls.h

@@ -1 @@
-/* $Id: controls.h,v 1.1 1999-10-20 06:38:08 sandervl Exp $ */
+/* $Id: controls.h,v 1.2 1999-12-30 18:32:58 cbratschi Exp $ */
 /*
  * Win32 common controls
@@ -19 +19 @@
 void CONTROLS_Unregister();
 
-#define BUTTON_CONTROL          0
-#define STATIC_CONTROL          1
-#define SCROLLBAR_CONTROL       2
-#define LISTBOX_CONTROL         3
-#define COMBOLBOX_CONTROL       4
-#define COMBOBOX_CONTROL        5
-#define EDIT_CONTROL            6
-#define MDICLIENT_CONTROL       7
-#define DIALOG_CONTROL          8
-#define DESKTOP_CONTROL         9
-#define MAX_CONTROLS            10
+#define BUTTON_CONTROL          0
+#define STATIC_CONTROL          1
+#define SCROLLBAR_CONTROL       2
+#define LISTBOX_CONTROL         3
+#define COMBOLBOX_CONTROL       4
+#define COMBOBOX_CONTROL        5
+#define EDIT_CONTROL            6
+#define MDICLIENT_CONTROL       7
+#define DIALOG_CONTROL          8
+#define DESKTOP_CONTROL         9
+#define WINSWITCH_CONTROL       10
+#define ICONTITLE_CONTROL       11
+#define MAX_CONTROLS            12
 
 BOOL WIDGETS_IsControl(Win32BaseWindow *window, int control);

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.128 1999-12-30 11:21:00 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.129 1999-12-30 18:32:59 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2875 +2875 @@
 BOOL Win32BaseWindow::hasWindowName(LPSTR wndname, BOOL fUnicode)
 {
-    if(wndname == NULL)
-      return FALSE;
-
-    if(fUnicode) {
-            return (lstrcmpW(windowNameW, (LPWSTR)wndname) == 0);
-    }
-    else    return (strcmp(windowNameA, wndname) == 0);
+    INT len = GetWindowTextLength();
+    BOOL res;
+
+    if (wndname == NULL)
+      return (len == 0);
+
+    len++;
+    if (fUnicode)
+    {
+      WCHAR *text = (WCHAR*)malloc(len*sizeof(WCHAR));
+
+      GetWindowTextW(text,len);
+      res = (lstrcmpW(text,(LPWSTR)wndname) == 0);
+      free(text);
+    } else
+    {
+      CHAR *text = (CHAR*)malloc(len*sizeof(CHAR));
+
+      GetWindowTextA(text,len);
+      res = (strcmp(text,wndname) == 0);
+      free(text);
+    }
+
+    return res;
 }
 //******************************************************************************

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.61 1999-12-30 09:31:03 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.62 1999-12-30 18:33:00 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -101 +101 @@
          DWORD  getExStyle()                    { return dwExStyle; };
          void   setExStyle(DWORD newexstyle)    { dwExStyle = newexstyle; };
+         ULONG  getInstance()                   { return hInstance; };
+         void   setInstance(ULONG newinstance)  { hInstance = newinstance; };
          HWND   getWindowHandle()               { return Win32Hwnd; };
          HWND   getOS2WindowHandle()            { return OS2Hwnd; };
@@ -193 +195 @@
          BOOL   hasWindowName(LPSTR wndname, BOOL fUnicode = 0);
 Win32WndClass  *getClass()  { return windowClass; };
-        char   *getWindowNameA()              { return windowNameA; };
-Win32BaseWindow *getOwner()                   { return owner; };
+        //CB: windowNameA isn't always the window name!
+        char   *getWindowNameA()                    { return windowNameA; };
+Win32BaseWindow *getOwner()                         { return owner; };
+        void    setOwner(Win32BaseWindow *newOwner) { owner = newOwner; };
 
  SCROLLBAR_INFO *getScrollInfo(int nBar);