Changeset 577 for trunk/src


Ignore:
Timestamp:
Aug 19, 1999, 2:54:30 PM (26 years ago)
Author:
sandervl
Message:

Icon cleanup

Location:
trunk/src/user32
Files:
2 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/user32/Makefile

    r510 r577  
    1 # $Id: Makefile,v 1.13 1999-08-16 16:28:04 sandervl Exp $
     1# $Id: Makefile,v 1.14 1999-08-19 12:53:55 sandervl Exp $
    22
    33#
    … …  
    4545
    4646user32.obj: user32.cpp $(PDWIN32_INCLUDE)\wndproc.h \
    47             $(PDWIN32_INCLUDE)\wndclass.h icon.h syscolor.h
     47            $(PDWIN32_INCLUDE)\wndclass.h $(PDWIN32_INCLUDE)\winicon.h syscolor.h
    4848resstring.obj: resstring.cpp resstring.h
    4949char.obj: char.cpp user32.h
    5050loadres.obj: loadres.cpp user32.h
    51 icon.obj: icon.cpp icon.h
     51icon.obj: icon.cpp $(PDWIN32_INCLUDE)\winicon.h
    5252menu.obj: menu.cpp user32.h
    5353syscolor.obj: syscolor.cpp syscolor.h

  • trunk/src/user32/icon.cpp

    r120 r577  
    1 /* $Id: icon.cpp,v 1.4 1999-06-19 10:54:47 sandervl Exp $ */
     1/* $Id: icon.cpp,v 1.5 1999-08-19 12:53:55 sandervl Exp $ */
    22
    3 /*
    4  *
    5  * Project Odin Software License can be found in LICENSE.TXT
    6  *
    7  */
    83/*
    94 * Win32 icon conversion functions for OS/2
    105 *
    116 * Copyright 1998 Sander van Leeuwen
     7 *
     8 *
     9 * Project Odin Software License can be found in LICENSE.TXT
    1210 *
    1311 */
    … …  
    2523#include <iostream.h>
    2624#include <string.h>
    27 #define  _ICON_C_
    2825
    29 #define DWORD   ULONG
    30 #define LPVOID  VOID *
    31 #define WORD    USHORT
    32 #define WCHAR   USHORT
    33 #define HANDLE  ULONG
    34 #define LPWSTR  WCHAR *
     26#include <win32type.h>
    3527
    36 #include "icon.h"
    37 #include "misc.h"
     28#include <winicon.h>
     29#include <misc.h>
    3830
    3931//******************************************************************************

  • trunk/src/user32/new/icon.cpp

    r345 r577  
    1 /* $Id: icon.cpp,v 1.2 1999-07-20 15:46:53 sandervl Exp $ */
     1/* $Id: icon.cpp,v 1.3 1999-08-19 12:53:56 sandervl Exp $ */
    22
    33/*
    … …  
    2323#include <iostream.h>
    2424#include <string.h>
    25 #define  _ICON_C_
    2625
    27 #define DWORD   ULONG
    28 #define LPVOID  VOID *
    29 #define WORD    USHORT
    30 #define WCHAR   USHORT
    31 #define HANDLE  ULONG
    32 #define LPWSTR  WCHAR *
     26#include <win32type.h>
    3327
    34 #include "icon.h"
    35 #include "misc.h"
     28#include <winicon.h>
     29#include <misc.h>
    3630
    3731//******************************************************************************

  • trunk/src/user32/new/makefile

    r510 r577  
    1 # $Id: makefile,v 1.24 1999-08-16 16:28:04 sandervl Exp $
     1# $Id: makefile,v 1.25 1999-08-19 12:53:56 sandervl Exp $
    22
    33#
    … …  
    5555
    5656user32.obj: user32.cpp $(PDWIN32_INCLUDE)\wndproc.h \
    57             icon.h syscolor.h
     57            $(PDWIN32_INCLUDE)\winicon.h syscolor.h
    5858resstring.obj: resstring.cpp resstring.h
    5959char.obj: char.cpp user32.h
    6060loadres.obj: loadres.cpp user32.h
    61 icon.obj: icon.cpp icon.h
     61icon.obj: icon.cpp $(PDWIN32_INCLUDE)\winicon.h
    6262winmenu.obj: winmenu.cpp user32.h $(PDWIN32_INCLUDE)\winres.h
    6363syscolor.obj: syscolor.cpp syscolor.h
    … …  
    9696winaccel.obj:     winaccel.cpp  $(PDWIN32_INCLUDE)\winres.h
    9797winscrollbar.obj: winscrollbar.cpp
    98 winicon.obj:    winicon.cpp
     98winicon.obj:    winicon.cpp $(PDWIN32_INCLUDE)\winicon.h
    9999
    100100pmwindow.obj:   pmwindow.cpp win32class.h win32wnd.h win32dlg.h pmwindow.h win32wndchild.h $(PDWIN32_INCLUDE)\wprocess.h  oslibgdi.h

  • trunk/src/user32/new/user32.cpp

    r396 r577  
    1 /* $Id: user32.cpp,v 1.13 1999-07-25 20:00:52 cbratschi Exp $ */
     1/* $Id: user32.cpp,v 1.14 1999-08-19 12:53:56 sandervl Exp $ */
    22
    33/*
    … …  
    3030
    3131#include "user32.h"
    32 #include "icon.h"
     32#include <winicon.h>
    3333#include "usrcall.h"
    3434#include "syscolor.h"

  • trunk/src/user32/new/winicon.cpp

    r395 r577  
    1 /* $Id: winicon.cpp,v 1.1 1999-07-25 17:47:25 sandervl Exp $ */
     1/* $Id: winicon.cpp,v 1.2 1999-08-19 12:53:57 sandervl Exp $ */
    22/*
    33 * Win32 Icon Code for OS/2
    … …  
    1111 */
    1212#include <os2win.h>
    13 #include "icon.h"
     13#include <winicon.h>
    1414
    1515//******************************************************************************

  • trunk/src/user32/user32.cpp

    r407 r577  
    1 /* $Id: user32.cpp,v 1.20 1999-08-03 21:22:33 sandervl Exp $ */
     1/* $Id: user32.cpp,v 1.21 1999-08-19 12:53:55 sandervl Exp $ */
    22
    33/*
    … …  
    2525#include "wndproc.h"
    2626#include "wndclass.h"
    27 #include "icon.h"
    2827#include "usrcall.h"
    2928#include "syscolor.h"
    … …  
    3231#include <stdlib.h>
    3332#include <string.h>
     33#include <winicon.h>
    3434
    3535//undocumented stuff
    … …  
    13981398}
    13991399//******************************************************************************
    1400 //******************************************************************************
    14011400HWND WIN32API CreateMDIWindowA(LPCSTR arg1, LPCSTR arg2, DWORD arg3,
    14021401                               int arg4, int arg5, int arg6, int arg7,
Note: See TracChangeset for help on using the changeset viewer.