Changeset 345 for trunk/src

Timestamp:

Jul 20, 1999, 5:46:54 PM (26 years ago)

Author:

sandervl

Message:

Accelerator + icon changes

Location:

trunk/src/user32/new

Files:

• icon.cpp (modified) (1 diff)
• loadres.cpp (modified) (3 diffs)
• makefile (modified) (4 diffs)
• oslibres.cpp (added)
• oslibres.h (added)
• oslibwin.cpp (modified) (2 diffs)
• oslibwin.h (modified) (2 diffs)
• win32class.h (modified) (2 diffs)
• win32wnd.cpp (modified) (7 diffs)
• win32wnd.h (modified) (3 diffs)

trunk/src/user32/new/icon.cpp

@@ -1 @@
-/* $Id: icon.cpp,v 1.1 1999-07-14 08:35:34 sandervl Exp $ */
+/* $Id: icon.cpp,v 1.2 1999-07-20 15:46:53 sandervl Exp $ */
 
-/*
- *
- * Project Odin Software License can be found in LICENSE.TXT
- *
- */
 /*
  * Win32 icon conversion functions for OS/2
  *
  * Copyright 1998 Sander van Leeuwen
+ *
+ *
+ * Project Odin Software License can be found in LICENSE.TXT
  *
  */

trunk/src/user32/new/loadres.cpp

@@ -1 @@
-/* $Id: loadres.cpp,v 1.3 1999-07-20 07:42:35 sandervl Exp $ */
+/* $Id: loadres.cpp,v 1.4 1999-07-20 15:46:53 sandervl Exp $ */
 
 /*
@@ -37 +37 @@
  HICON rc;
 
-    if((int)lpszIcon >> 16 != 0) {//convert string name identifier to numeric id
-         dprintf(("LoadIcon %s\n", lpszIcon));
-         lpszIcon = (LPCSTR)ConvertNameId(hinst, (char *)lpszIcon);
-    }
-    else dprintf(("LoadIcon %d\n", (int)lpszIcon));
+    rc = (HICON)FindResourceA(hinst, lpszIcon, RT_ICONA);
+    dprintf(("LoadIconA (%X) returned %d\n", hinst, rc));
+    return(rc);
+}
+//******************************************************************************
+//******************************************************************************
+HICON WIN32API LoadIconW(HINSTANCE hinst, LPCWSTR lpszIcon)
+{
+ HICON rc;
 
-    rc = O32_LoadIcon(hinst, lpszIcon);
-
-    dprintf(("LoadIcon returned %d\n", rc));
+    rc = (HICON)FindResourceW(hinst, lpszIcon, RT_ICONW);
+    dprintf(("LoadIconW (%X) returned %d\n", hinst, rc));
     return(rc);
 }
@@ -134 +137 @@
 }
 //******************************************************************************
-//******************************************************************************
-HICON WIN32API LoadIconW(HINSTANCE hinst, LPCWSTR lpszIcon)
-{
- char  *astring = NULL;
- HICON rc;
-
-    if((int)lpszIcon >> 16 != 0) {//convert string name identifier to numeric id
-         astring = UnicodeToAsciiString((LPWSTR)lpszIcon);
-
-         dprintf(("lpszIcon %s\n", astring));
-         lpszIcon = (LPWSTR)ConvertNameId(hinst, (char *)astring);
-    }
-    else dprintf(("lpszIcon %d\n", (int)lpszIcon));
-
-    rc = O32_LoadIcon(hinst, (char *)lpszIcon);
-    if(astring)
-        FreeAsciiString(astring);
-
-    dprintf(("LoadIconW returned %d\n", rc));
-    return(rc);
-}
-//******************************************************************************
-//******************************************************************************
-//******************************************************************************
 //TODO: Far from complete, but works for loading resources from exe
 //fuLoad flag ignored

trunk/src/user32/new/makefile

@@ -1 @@
-# $Id: makefile,v 1.13 1999-07-20 07:42:35 sandervl Exp $
+# $Id: makefile,v 1.14 1999-07-20 15:46:53 sandervl Exp $
 
 #
@@ -31 +31 @@
         controls.obj button.obj oslibutil.obj oslibmsg.obj windlg.obj \
         winprop.obj wingdi.obj oslibgdi.obj winaccel.obj winscrollbar.obj \
-        nativerc.obj
+        nativerc.obj oslibres.obj
 
 
@@ -91 +91 @@
 pmwindow.obj:   pmwindow.cpp win32class.h win32wnd.h win32dlg.h pmwindow.h win32wndchild.h $(PDWIN32_INCLUDE)\wprocess.h  oslibgdi.h
 win32class.obj: win32class.cpp win32class.h win32wnd.h win32dlg.h gen_object.h oslibwin.h win32wndchild.h
-win32wnd.obj:   win32wnd.cpp win32class.h win32wnd.h win32dlg.h gen_object.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h
+win32wnd.obj:   win32wnd.cpp win32class.h win32wnd.h win32dlg.h gen_object.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h
 win32dlg.obj:   win32dlg.cpp win32class.h win32wnd.h win32dlg.h gen_object.h oslibwin.h win32wndchild.h
 win32wndchild.obj: win32wndchild.cpp win32wndchild.h
@@ -99 +99 @@
 oslibmsg.obj:   oslibmsg.cpp oslibmsg.h
 oslibgdi.obj:   oslibgdi.cpp oslibgdi.h
+oslibres.obj:   oslibres.cpp oslibwin.h oslibres.h
 
 clean:

trunk/src/user32/new/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.17 1999-07-20 07:42:35 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.18 1999-07-20 15:46:53 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -143 +143 @@
 //******************************************************************************
 //******************************************************************************
-HWND OSLibWinCreateMenu(HWND hwndParent, PVOID menutemplate)
-{
-  return WinCreateMenu(hwndParent, menutemplate);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL OSLibWinSetAccelTable(HWND hwnd, PVOID acceltemplate)
-{
- HACCEL haccel;
- HAB    hab = WinQueryAnchorBlock(hwnd);
-
-    haccel = WinCreateAccelTable(hab, (PACCELTABLE)acceltemplate);
-    if(haccel == 0) {
-        dprintf(("OSLibWinSetAccelTable: WinCreateAccelTable returned 0"));
-        return FALSE;
-    }
-    return WinSetAccelTable(hab, haccel, hwnd);
-}
 //******************************************************************************
 //******************************************************************************

trunk/src/user32/new/oslibwin.h

@@ -1 @@
-/* $Id: oslibwin.h,v 1.15 1999-07-20 07:42:36 sandervl Exp $ */
+/* $Id: oslibwin.h,v 1.16 1999-07-20 15:46:53 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -26 +26 @@
 
 BOOL  OSLibPostMessage(HWND hwnd, ULONG msg, ULONG wParam, ULONG lParam);
-
-HWND  OSLibWinCreateMenu(HWND hwndParent, PVOID menutemplate);
-BOOL  OSLibWinSetAccelTable(HWND hwnd, PVOID acceltemplate);
 
 #define WAOS_WARNING                 0

trunk/src/user32/new/win32class.h

@@ -1 @@
-/* $Id: win32class.h,v 1.2 1999-07-14 08:35:37 sandervl Exp $ */
+/* $Id: win32class.h,v 1.3 1999-07-20 15:46:53 sandervl Exp $ */
 /*
  * Win32 Window Class Managment Code for OS/2
@@ -43 +43 @@
          DWORD  getExtraWndWords()      { return nrExtraWindowWords; };
 
+         HICON  getIcon()               { return hIcon; };
+
           void  setMenuName(LPSTR newMenuName);
 

trunk/src/user32/new/win32wnd.cpp

@@ -1 @@
-/* $Id: win32wnd.cpp,v 1.17 1999-07-20 07:42:36 sandervl Exp $ */
+/* $Id: win32wnd.cpp,v 1.18 1999-07-20 15:46:54 sandervl Exp $ */
 /*
  * Win32 Window Code for OS/2
@@ -29 +29 @@
 #include <oslibutil.h>
 #include <oslibgdi.h>
+#include <oslibres.h>
 #include <winres.h>
 
@@ -102 +103 @@
   acceltableResource = NULL;
   menuResource       = NULL;
-}
-//******************************************************************************
+  iconResource       = NULL;
+}
+//******************************************************************************
+//todo get rid of resources (menu, accel, icon etc)
 //******************************************************************************
 Win32Window::~Win32Window()
@@ -389 +392 @@
   else  windowId = (UINT)cs->hMenu;
 
+  //Set icon from class
+  if(windowClass->getIcon())
+        SetIcon(windowClass->getIcon());
+
   /* Send the WM_CREATE message
    * Perhaps we shouldn't allow width/height changes as well.
@@ -416 +423 @@
                 HOOK_CallHooks16( WH_SHELL, HSHELL_WINDOWCREATED, hwnd, 0 );
 #endif
+        SetLastError(0);
         return TRUE;
         }
@@ -1056 +1064 @@
 //******************************************************************************
 //******************************************************************************
-BOOL Win32Window::SetMenu(ULONG hMenu)
+BOOL Win32Window::SetMenu(HMENU hMenu)
 {
  PVOID          menutemplate;
@@ -1082 +1090 @@
 //******************************************************************************
 //******************************************************************************
-BOOL Win32Window::SetAccelTable(ULONG hAccel)
+BOOL Win32Window::SetAccelTable(HACCEL hAccel)
 {
  Win32Resource *winres = (Win32Resource *)hAccel;
+ HANDLE         accelhandle;
 
     if(HIWORD(hAccel) == 0) {
         dprintf(("SetAccelTable: hAccel %x invalid", hAccel));
-            SetLastError(ERROR_INVALID_PARAMETER);
-            return FALSE;
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
     }
     acceltableResource = winres;
-        return OSLibWinSetAccelTable(OS2HwndFrame, winres->lockOS2Resource());
+    accelhandle = OSLibWinSetAccelTable(OS2HwndFrame, winres->getOS2Handle(), winres->lockOS2Resource());
+    winres->setOS2Handle(accelhandle);
+    return(accelhandle != 0);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL Win32Window::SetIcon(HICON hIcon)
+{
+ Win32Resource *winres = (Win32Resource *)hIcon;
+ HANDLE         iconhandle;
+
+    if(HIWORD(hIcon) == 0) {
+        dprintf(("SetIcon: hIcon %x invalid", hIcon));
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+    }
+    dprintf(("Win32Window::SetIcon %x", hIcon));
+    iconResource = winres;
+    iconhandle = OSLibWinSetIcon(OS2HwndFrame, winres->getOS2Handle(), winres->lockOS2Resource());
+    winres->setOS2Handle(iconhandle);
+    return(iconhandle != 0);
 }
 //******************************************************************************

trunk/src/user32/new/win32wnd.h

@@ -1 @@
-/* $Id: win32wnd.h,v 1.16 1999-07-20 07:42:36 sandervl Exp $ */
+/* $Id: win32wnd.h,v 1.17 1999-07-20 15:46:54 sandervl Exp $ */
 /*
  * Win32 Window Code for OS/2
@@ -93 +93 @@
          void   setFlags(DWORD newflags)        { flags = newflags; };
 
-         ULONG  GetAccelTable()                     { return (ULONG) acceltableResource; };
+         HACCEL GetAccelTable()                     { return (HACCEL) acceltableResource; };
          BOOL   SetAccelTable(ULONG hAccel);
 
-         ULONG  GetMenu()                           { return (ULONG) menuResource; };
+         HMENU  GetMenu()                           { return (HMENU) menuResource; };
          BOOL   SetMenu(ULONG hMenu);
+
+         BOOL   SetIcon(HICON hIcon);
+         HICON  GetIcon()                           { return (HICON) iconResource; };
 
          BOOL   ShowWindow(ULONG nCmdShow);
@@ -191 +194 @@
  Win32Resource *acceltableResource;
  Win32Resource *menuResource;
+ Win32Resource *iconResource;
 
         char   *windowName;