Overview
Comment: | win32 branch commit |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
ae315380c17bd3bf683b4ddc5f2957a0 |
User & Date: | dillonaumiller@gmail.com on 2012-01-05 02:22:08 |
Other Links: | manifest | tags |
Context
2012-01-05
| ||
14:39 | Unbreak Gtk. check-in: 39b3140423 user: js tags: trunk | |
14:31 | Add forgotten copyright. check-in: 82ab8cf0ef user: js tags: trunk | |
02:22 | win32 branch commit check-in: ae315380c1 user: dillonaumiller@gmail.com tags: trunk | |
Changes
Added .hgignore version [9564fcd29f].
|
Modified headers/OGBox.h from [aa583d8cb5] to [19a668760d].
1 2 3 4 5 6 7 8 9 | 1 2 3 4 5 6 7 8 9 10 | + | /* * Copyright (c) 2011, 2012, Jonathan Schleifer <js@webkeks.org> * Copyright (c) 2011, 2012, Dillon Aumiller <dillonaumiller@gmail.com> * * https://webkeks.org/hg/objgui/ * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice is present in all copies. * |
︙ | |||
17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | + + + + + + + + + + + + + + + + + | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #import "OGWidget.h" #ifdef OG_W32 typedef struct s_OGBoxChild { HWND hwnd; BOOL expand; BOOL fill; int padding; int originalSize; float currentSize; struct s_OGBoxChild *next; } OGBoxChild; #endif @interface OGBox: OGWidget #ifdef OG_W32 { OGBoxChild *firstBorn; } - (void)resizeChildren; #endif + box; - (void)appendChild: (OGWidget*)child expand: (BOOL)expand fill: (BOOL)fill padding: (float)padding; - (void)prependChild: (OGWidget*)child expand: (BOOL)expand fill: (BOOL)fill padding: (float)padding; @end |
Modified headers/OGComboBox.h from [b779f946c9] to [66411fb990].
1 2 3 4 5 6 7 8 9 | 1 2 3 4 5 6 7 8 9 10 | + | /* * Copyright (c) 2011, 2012, Jonathan Schleifer <js@webkeks.org> * Copyright (c) 2011, 2012, Dillon Aumiller <dillonaumiller@gmail.com> * * https://webkeks.org/hg/objgui/ * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice is present in all copies. * |
︙ | |||
37 38 39 40 41 42 43 44 45 46 47 48 49 | 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 | + + + + + + | @end @interface OGComboBox: OGWidget { id <OGComboBoxDelegate> delegate; id <OGComboBoxDataSource> dataSource; } #ifdef OG_W32 //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; @end |
Modified headers/OGWidget.h from [d55653aa53] to [647ac79ffe].
1 2 3 4 5 6 7 8 9 | 1 2 3 4 5 6 7 8 9 10 | + | /* * Copyright (c) 2011, 2012, Jonathan Schleifer <js@webkeks.org> * Copyright (c) 2011, 2012, Dillon Aumiller <dillonaumiller@gmail.com> * * https://webkeks.org/hg/objgui/ * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice is present in all copies. * |
︙ | |||
19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | + + + + + + + + + + + | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #ifdef OG_GTK # include <gtk/gtk.h> #endif #ifdef OG_W32 # include <windows.h> #endif #import <ObjFW/ObjFW.h> @interface OGWidget: OFObject { @public #ifdef OG_GTK GtkWidget *widget; #endif #ifdef OG_W32 HWND widget; #endif } - (void)show; - (void)hide; @end #ifdef OG_GTK extern void og_destroy(GtkWidget*, OGWidget*); #endif #ifdef OG_W32 extern void og_destroy(HWND widget, OGWidget *object); #endif |
Added win32/Makefile version [2dc76f23f3].
|
Added win32/OGApplication.m version [2c830d0590].