Mercurial > dwindows
diff dw.h @ 1392:943266c86aed
Refactoring OS/2 and Windows code... eliminating BubbleButton...
BubbleButton was no longer really used in Windows since I switched to native tooltips...
However parts of it were still hanging around. Merging BubbleButton into WindowData on
OS/2 to prepare for generic tooltip support. More coming very soon.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Sat, 26 Nov 2011 22:47:20 +0000 |
parents | 0512fbb08abf |
children | 56f311dc23f6 |
line wrap: on
line diff
--- a/dw.h Sat Nov 26 21:05:49 2011 +0000 +++ b/dw.h Sat Nov 26 22:47:20 2011 +0000 @@ -79,7 +79,6 @@ #define SIZEEXPAND 1 #define SPLITBAR_WIDTH 4 -#define BUBBLE_HELP_MAX 256 typedef struct _user_data { @@ -222,12 +221,15 @@ #define VK_LMENU VK_MENU #define VK_RMENU VK_MENU +#define BUBBLE_HELP_MAX 256 + typedef struct _window_data { PFNWP oldproc; UserData *root; HWND clickdefault; ULONG flags; void *data; + char bubbletext[BUBBLE_HELP_MAX]; } WindowData; typedef struct _hpixmap { @@ -688,20 +690,6 @@ struct _item *items; } Box; -typedef struct _bubblebutton { -#if defined(__WIN32__) || defined(WINNT) - ColorInfo cinfo; - int checkbox; - WNDPROC pOldProc; -#endif -#if defined(__OS2__) || defined(__EMX__) - PFNWP pOldProc; - UserData *root; - unsigned long id; - char bubbletext[BUBBLE_HELP_MAX]; -#endif -} BubbleButton; - #elif defined(__PHOTON__) #include <stdio.h> #include <stdlib.h>