Changeset 10967


Ignore:
Timestamp:
Jul 20, 1999, 5:51:06 PM (26 years ago)
Author:
cbratschi
Message:

controls update

Location:
tags/trunk/src/user32/new
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified tags/trunk/src/user32/new/button.cpp

    r10955 r10967  
    2020#include "controls.h"
    2121#include "button.h"
    22 
    23 #define BUTTONCLASSNAME "Button"
    2422
    2523//Prototypes
    … …  
    905903}
    906904
    907 void BUTTON_Register()
     905BOOL BUTTON_Register()
    908906{
    909907    WNDCLASSA wndClass;
    910908
    911     if (GlobalFindAtomA (BUTTONCLASSNAME)) return;
     909    if (GlobalFindAtomA (ODINBUTTONCLASSNAME)) return FALSE;
    912910
    913911    ZeroMemory (&wndClass, sizeof(WNDCLASSA));
    … …  
    918916    wndClass.hCursor       = LoadCursorA (0, IDC_ARROWA);
    919917    wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1);
    920     wndClass.lpszClassName = BUTTONCLASSNAME;
    921 
    922     RegisterClassA (&wndClass);
    923 }
    924 
    925 
    926 void BUTTON_Unregister()
    927 {
    928     if (GlobalFindAtomA (BUTTONCLASSNAME))
    929         UnregisterClassA (BUTTONCLASSNAME, (HINSTANCE)NULL);
    930 }
     918    wndClass.lpszClassName = ODINBUTTONCLASSNAME;
     919
     920    return RegisterClassA (&wndClass);
     921}
     922
     923
     924BOOL BUTTON_Unregister()
     925{
     926    if (GlobalFindAtomA (ODINBUTTONCLASSNAME))
     927        UnregisterClassA (ODINBUTTONCLASSNAME, (HINSTANCE)NULL);
     928    return TRUE; //always TRUE
     929}

  • TabularUnified tags/trunk/src/user32/new/controls.cpp

    r10938 r10967  
    55 */
    66
     7#include <os2win.h>
     8#include <string.h>
     9#include "misc.h"
     10
    711#include "controls.h"
    812#include "button.h"
    913
     14/* registration */
     15
    1016void CONTROLS_Register()
    1117{
    12   BUTTON_Register;
     18  dprintf(("Register BUTTON class"));
     19  BUTTON_Register() ? dprintf(("done")):dprintf(("failed!!!"));
    1320}
    1421
    1522void CONTROLS_Unregister()
    1623{
    17   BUTTON_Unregister;
     24  dprintf(("Unregister BUTTON class"));
     25  BUTTON_Unregister();
    1826}
     27
     28/* Win32 <-> internal control name */
     29
     30char* Win32ToOdinControlName(char* name)
     31{
     32  if (!name) return NULL;
     33
     34  if (stricmp(name,WIN32BUTTONCLASSNAME))
     35    return ODINBUTTONCLASSNAME;
     36
     37  return name; //original name
     38}
     39
     40char* OdinToWin32ControlName(char* name)
     41{
     42  if (!name) return NULL;
     43
     44  if (stricmp(name,ODINBUTTONCLASSNAME))
     45    return WIN32BUTTONCLASSNAME;
     46
     47  return name; //original name
     48}

  • TabularUnified tags/trunk/src/user32/new/initterm.cpp

    r10926 r10967  
    1 /* $Id: initterm.cpp,v 1.2 1999-07-14 21:05:58 cbratschi Exp $ */
     1/* $Id: initterm.cpp,v 1.3 1999-07-20 15:51:06 cbratschi Exp $ */
    22
    33/*
    … …  
    111111                return 0UL;
    112112
    113          //SvL: 18-7-'98, Register system window classes (button, listbox etc etc)
    114          RegisterSystemClasses(hModule);
    115 
    116113         //SvL: Try to start communication with our message spy queue server
    117114         InitSpyQueue();
    … …  
    121118                return 0UL;
    122119         }
     120
     121         //SvL: 18-7-'98, Register system window classes (button, listbox etc etc)
     122         //CB: register internal classes
     123         RegisterSystemClasses(hModule);
     124
    123125         break;
    124126      case 1 :

  • TabularUnified tags/trunk/src/user32/new/windowclass.cpp

    r10935 r10967  
    1 /* $Id: windowclass.cpp,v 1.5 1999-07-16 11:32:09 sandervl Exp $ */
     1/* $Id: windowclass.cpp,v 1.6 1999-07-20 15:51:06 cbratschi Exp $ */
    22/*
    33 * Win32 Window Class Code for OS/2
    … …  
    1919#include <win32class.h>
    2020#include <win32wnd.h>
     21#include <controls.h>
    2122
    2223//******************************************************************************
    … …  
    2425void RegisterSystemClasses(ULONG hModule)
    2526{
     27  dprintf(("RegisterSystemClasses\n"));
     28  CONTROLS_Register();
    2629}
    2730//******************************************************************************
    … …  
    2932void UnregisterSystemClasses()
    3033{
     34  dprintf(("UnregisterSystemClasses\n"));
     35  CONTROLS_Unregister();
    3136}
    3237//******************************************************************************
Note: See TracChangeset for help on using the changeset viewer.