Changeset 380 for trunk/include/win

Timestamp:

Jul 24, 1999, 2:37:53 PM (26 years ago)

Author:

sandervl

Message:

* empty log message *

Location:

trunk/include/win

Files:

• combo.h (modified) (5 diffs)
• controls.h (modified) (1 diff)

trunk/include/win/combo.h

@@ -1 @@
-/* $Id: combo.h,v 1.1 1999-05-24 20:19:09 ktk Exp $ */
+/* $Id: combo.h,v 1.2 1999-07-24 12:37:53 sandervl Exp $ */
 
 /*
@@ -7 +7 @@
 #ifndef __WINE_COMBO_H
 #define __WINE_COMBO_H
+
+#define LISTBOXCLASSNAME  "LISTBOX"
+#define COMBOLBOXCLASSNAME "COMBOLBOX"
+#define COMBOBOXCLASSNAME "COMBOBOX"
 
 #define ID_CB_LISTBOX           1000
@@ -16 +20 @@
 #define CBF_BUTTONDOWN          0x0002
 #define CBF_NOROLLUP            0x0004
-#define CBF_MEASUREITEM         0x0008
+#define CBF_MEASUREITEM         0x0008
 #define CBF_FOCUSED             0x0010
 #define CBF_CAPTURE             0x0020
 #define CBF_EDIT                0x0040
-#define CBF_NORESIZE            0x0080
-#define CBF_NOTIFY              0x0100
+#define CBF_NORESIZE            0x0080
+#define CBF_NOTIFY              0x0100
 #define CBF_NOREDRAW            0x0200
-#define CBF_SELCHANGE           0x0400
+#define CBF_SELCHANGE           0x0400
+#define CBF_NOEDITNOTIFY        0x1000
 #define CBF_EUI                 0x8000
 
@@ -30 +35 @@
 typedef struct
 {
-   WND*         self;
-   HWND         owner;
-   UINT         dwStyle;
-   HWND         hWndEdit;
-   HWND         hWndLBox;
-   UINT         wState;
-   HFONT        hFont;
+   HWND         hwndself;
+   HWND         owner;
+   UINT         dwStyle;
+   HWND         hWndEdit;
+   HWND         hWndLBox;
+   UINT         wState;
+   HFONT        hFont;
    RECT         textRect;
    RECT         buttonRect;
    RECT         droppedRect;
+   INT          droppedIndex;
    INT          fixedOwnerDrawHeight;
-   INT          droppedWidth;           /* last two are not used unless set */
-   INT          editHeight;             /* explicitly */
+   INT          droppedWidth;           /* last two are not used unless set */
+   INT          editHeight;             /* explicitly */
 } HEADCOMBO,*LPHEADCOMBO;
 
@@ -50 +56 @@
 
 #define CB_GETTYPE( lphc )    ((lphc)->dwStyle & (CBS_DROPDOWNLIST))
-#define CB_DISABLED( lphc )   ((lphc)->self->dwStyle & WS_DISABLED)
+#define CB_DISABLED( lphc )   (GetWindowLongA((lphc)->hwndself,GWL_STYLE) & WS_DISABLED)
 #define CB_OWNERDRAWN( lphc ) ((lphc)->dwStyle & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE))
 #define CB_HASSTRINGS( lphc ) ((lphc)->dwStyle & CBS_HASSTRINGS)
-#define CB_HWND( lphc )       ((lphc)->self->hwndSelf)
+#define CB_HWND( lphc )       ((lphc)->hwndself)
 
-BOOL    COMBO_FlipListbox( LPHEADCOMBO, BOOL );
-HWND    COMBO_GetLBWindow( WND* );
+BOOL    COMBO_FlipListbox( LPHEADCOMBO, BOOL );
+HWND    COMBO_GetLBWindow( HWND );
 LRESULT COMBO_Directory( LPHEADCOMBO, UINT, LPSTR, BOOL );
+
+BOOL LISTBOX_Register();
+BOOL LISTBOX_Unregister();
+BOOL COMBOLBOX_Register();
+BOOL COMBOLBOX_Unregister();
+
+BOOL COMBOBOX_Register();
+BOOL COMBOBOX_Unregister();
 
 #endif /* __WINE_COMBO_H */

trunk/include/win/controls.h

@@ +1 @@
+/* $Id */
 /*
  * Win32 common controls