Clean up headers a little.

This commit is contained in:
Jonathan Schleifer 2012-01-05 16:08:37 +01:00
parent 50c5df7fa2
commit 34cfdb8154
5 changed files with 57 additions and 38 deletions

View file

@ -24,23 +24,25 @@
#import "OGWidget.h"
#ifdef OG_WIN32
typedef struct s_OGBoxChild
typedef struct og_box_child_t
{
HWND hwnd;
BOOL expand;
BOOL fill;
int padding;
int originalSize;
float currentSize;
struct s_OGBoxChild *next;
} OGBoxChild;
HWND hwnd;
BOOL expand;
BOOL fill;
int padding;
int originalSize;
float currentSize;
struct og_box_child_t *next;
} og_box_child_t;
#endif
@interface OGBox: OGWidget
#ifdef OG_WIN32
{ OGBoxChild *firstBorn; }
- (void)resizeChildren;
{
og_child_box_t *firstBorn;
}
#endif
+ box;
- (void)appendChild: (OGWidget*)child
expand: (BOOL)expand
@ -50,4 +52,8 @@ typedef struct s_OGBoxChild
expand: (BOOL)expand
fill: (BOOL)fill
padding: (float)padding;
#ifdef OG_WIN32
- (void)OG_resizeChildren;
#endif
@end

View file

@ -43,14 +43,18 @@
id <OGComboBoxDataSource> dataSource;
}
#ifdef OG_WIN32
//unfortunately, the built-in Win32 ListBox stores a pointer to it's parent (for sending selection changed notifications) during CreateWindow().
//it does not update it after a SetParent()... unless we implement a custom ListBox control i don't see a way around this...
- initWithParent : (OGWidget *)parent;
#endif
@property (assign) id <OGComboBoxDelegate> delegate;
@property (assign) id <OGComboBoxDataSource> dataSource;
+ comboBox;
#ifdef OG_WIN32
/*
* Unfortunately, the built-in Win32 ListBox stores a pointer to it's parent
* (for sending selection changed notifications) during CreateWindow(). It does
* not update it after a SetParent() unless we implement a custom ListBox
* control, so there seems to be no way around this.
*/
- initWithParent: (OGWidget*)parent;
#endif
@end