Mercurial > dwindows
comparison 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 |
comparison
equal
deleted
inserted
replaced
1391:614fb124d2e2 | 1392:943266c86aed |
---|---|
77 | 77 |
78 #define SIZESTATIC 0 | 78 #define SIZESTATIC 0 |
79 #define SIZEEXPAND 1 | 79 #define SIZEEXPAND 1 |
80 | 80 |
81 #define SPLITBAR_WIDTH 4 | 81 #define SPLITBAR_WIDTH 4 |
82 #define BUBBLE_HELP_MAX 256 | |
83 | 82 |
84 typedef struct _user_data | 83 typedef struct _user_data |
85 { | 84 { |
86 struct _user_data *next; | 85 struct _user_data *next; |
87 void *data; | 86 void *data; |
220 #define VK_NUMPAD9 ('9' + 128) | 219 #define VK_NUMPAD9 ('9' + 128) |
221 #define VK_BACK VK_BACKSPACE | 220 #define VK_BACK VK_BACKSPACE |
222 #define VK_LMENU VK_MENU | 221 #define VK_LMENU VK_MENU |
223 #define VK_RMENU VK_MENU | 222 #define VK_RMENU VK_MENU |
224 | 223 |
224 #define BUBBLE_HELP_MAX 256 | |
225 | |
225 typedef struct _window_data { | 226 typedef struct _window_data { |
226 PFNWP oldproc; | 227 PFNWP oldproc; |
227 UserData *root; | 228 UserData *root; |
228 HWND clickdefault; | 229 HWND clickdefault; |
229 ULONG flags; | 230 ULONG flags; |
230 void *data; | 231 void *data; |
232 char bubbletext[BUBBLE_HELP_MAX]; | |
231 } WindowData; | 233 } WindowData; |
232 | 234 |
233 typedef struct _hpixmap { | 235 typedef struct _hpixmap { |
234 unsigned long width, height; | 236 unsigned long width, height; |
235 HDC hdc; | 237 HDC hdc; |
685 /* Any combinations of flags describing the box */ | 687 /* Any combinations of flags describing the box */ |
686 unsigned long flags; | 688 unsigned long flags; |
687 /* Array of item structures */ | 689 /* Array of item structures */ |
688 struct _item *items; | 690 struct _item *items; |
689 } Box; | 691 } Box; |
690 | |
691 typedef struct _bubblebutton { | |
692 #if defined(__WIN32__) || defined(WINNT) | |
693 ColorInfo cinfo; | |
694 int checkbox; | |
695 WNDPROC pOldProc; | |
696 #endif | |
697 #if defined(__OS2__) || defined(__EMX__) | |
698 PFNWP pOldProc; | |
699 UserData *root; | |
700 unsigned long id; | |
701 char bubbletext[BUBBLE_HELP_MAX]; | |
702 #endif | |
703 } BubbleButton; | |
704 | 692 |
705 #elif defined(__PHOTON__) | 693 #elif defined(__PHOTON__) |
706 #include <stdio.h> | 694 #include <stdio.h> |
707 #include <stdlib.h> | 695 #include <stdlib.h> |
708 #include <unistd.h> | 696 #include <unistd.h> |