Changeset 3955 for trunk/include


Ignore:
Timestamp:
Aug 6, 2000, 11:32:30 AM (25 years ago)
Author:
sandervl
Message:

PD: Updated comctl32 to Wine 20000801

Location:
trunk/include/win
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/win/commctrl.h

    r3850 r3955  
    1 /* $Id: commctrl.h,v 1.33 2000-07-18 18:30:29 sandervl Exp $ */
     1/* $Id: commctrl.h,v 1.34 2000-08-06 09:30:47 sandervl Exp $ */
    22/*
    33 * Common controls definitions
    … …  
    38633863DWORD  WINAPI COMCTL32_GetSize (LPVOID);
    38643864
     3865LPWSTR WINAPI COMCTL32_StrChrW (LPCWSTR, WORD);
    38653866
    38663867INT  WINAPI Str_GetPtrA (LPCSTR, LPSTR, INT);

  • trunk/include/win/toolbar.h

    r3152 r3955  
    1 /* $Id: toolbar.h,v 1.6 2000-03-18 16:10:56 cbratschi Exp $ */
    2 
     1/* $Id: toolbar.h,v 1.7 2000-08-06 09:32:30 sandervl Exp $ */
    32/*
    43 * Toolbar class extra info
    54 *
    65 * Copyright 1998 Eric Kohl
    7  * Copyright 1999 Christoph Bratschi
    86 */
    97
    … …  
    119#define __WINE_TOOLBAR_H
    1210
    13 #define MAXTOOLNAME 100 //max length of TBBUTTON_INFO.pszName
     11#include "commctrl.h"
     12#include "windef.h"
    1413
    1514typedef struct tagTBUTTON_INFO
    … …  
    2221    INT iString;
    2322
    24     //for our needs
    2523    BOOL bHot;
    2624    INT nRow;
    2725    RECT rect;
    28     //Customize dialog
    29     BOOL   bDelete; //can delete
    30     LPWSTR pszName;
    31     INT    nCustomID;
    32 } TBUTTON_INFO;
     26} TBUTTON_INFO;
    3327
    3428
    3529typedef struct tagTOOLBAR_INFO
    3630{
    37     COMCTL32_HEADER header;
    38 
    39     DWORD    dwStructSize;   /* size of TBBUTTON struct */
     31    DWORD      dwStructSize;   /* size of TBBUTTON struct */
    4032    INT      nHeight;        /* height of the toolbar */
    4133    INT      nWidth;         /* width of the toolbar */
    … …  
    5244    INT      nNumBitmaps;     /* number of bitmaps */
    5345    INT      nNumStrings;     /* number of strings */
     46    BOOL     bUnicode;        /* ASCII (FALSE) or Unicode (TRUE)? */
    5447    BOOL     bCaptured;       /* mouse captured? */
    5548    INT      nButtonDown;
    … …  
    5851    HFONT    hFont;           /* text font */
    5952    HIMAGELIST himlInt;         /* image list created internally */
    60     HIMAGELIST himlDef;         /* default image list for TB_SETIMAGELIST*/
     53    HIMAGELIST himlDef;         /* default image list */
    6154    HIMAGELIST himlHot;         /* hot image list */
    6255    HIMAGELIST himlDis;         /* disabled image list */
    6356    HWND     hwndToolTip;     /* handle to tool tip control */
     57    HWND     hwndNotify;      /* handle to the window that gets notifications */
    6458    BOOL     bTransparent;    /* background transparency flag */
    6559    BOOL     bAutoSize;       /* auto size deadlock indicator */
    6660    BOOL     bAnchor;         /* anchor highlight enabled */
    67     DWORD    dwExStyle;       /* extended toolbar style */
    68     DWORD    dwDTFlags;       /* DrawText flags */
     61    DWORD      dwExStyle;       /* extended toolbar style */
     62    DWORD      dwDTFlags;       /* DrawText flags */
    6963
    70     COLORREF clrInsertMark;   /* insert mark color */
     64    COLORREF   clrInsertMark;   /* insert mark color */
    7165    RECT     rcBound;         /* bounding rectangle */
     66    INT      iVersion;
    7267
    7368    TBUTTON_INFO *buttons;      /* pointer to button array */
    7469    LPWSTR       *strings;      /* pointer to string array */
    75 
    76     //Customize dialog
    77     HWND          hwndToolbar;
    78     TBUTTON_INFO* oldButtons;
    79     INT           nNumOldButtons;
    80     INT           nMaxCustomID;
    81     BOOL          changed;
    8270} TOOLBAR_INFO;
    8371
     72
     73extern BOOL WINAPI TBARCUST_DialogProc (HWND, UINT, WPARAM, LPARAM);
    8474
    8575extern VOID TOOLBAR_Register (VOID);
    … …  
    8777
    8878#endif  /* __WINE_TOOLBAR_H */
    89 
Note: See TracChangeset for help on using the changeset viewer.