Rename OG_W32 to OG_WIN32.

headers/OGBox.h

@@ -23,7 +23,7 @@
 
 #import "OGWidget.h"
 
-#ifdef OG_W32
+#ifdef OG_WIN32
 typedef struct s_OGBoxChild
 {
 	HWND  hwnd;
@@ -37,7 +37,7 @@ typedef struct s_OGBoxChild
 #endif
 
 @interface OGBox: OGWidget
-#ifdef OG_W32
+#ifdef OG_WIN32
 { OGBoxChild *firstBorn; }
 - (void)resizeChildren;
 #endif

headers/OGComboBox.h

@@ -43,7 +43,7 @@
 	id <OGComboBoxDataSource> dataSource;
 }
 
-#ifdef OG_W32
+#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;

headers/OGWidget.h

@@ -21,10 +21,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef OG_GTK
+#if defined(OG_GTK)
 # include <gtk/gtk.h>
-#endif
-#ifdef OG_W32
+#elif defined(OG_WIN32)
 # include <windows.h>
 #endif
 
@@ -33,10 +32,9 @@
 @interface OGWidget: OFObject
 {
 @public
-#ifdef OG_GTK
+#if defined(OG_GTK)
 	GtkWidget *widget;
-#endif
-#ifdef OG_W32
+#elif defined(OG_WIN32)
 	HWND widget;
 #endif
 }
@@ -45,9 +43,8 @@
 - (void)hide;
 @end
 
-#ifdef OG_GTK
+#if defined(OG_GTK)
 extern void og_destroy(GtkWidget*, OGWidget*);
-#endif
-#ifdef OG_W32
+#elif defined(OG_WIN32)
 extern void og_destroy(HWND widget, OGWidget *object);
 #endif

win32/Makefile

@@ -3,7 +3,7 @@ PREFIX ?= /usr/local
 all : test.exe
 
 %.o : %.m
-	gcc -g -DOG_W32 -I../headers -c -o $@ $^ `objfw-config --cppflags --objcflags`
+	gcc -g -DOG_WIN32 -I../headers -c -o $@ $^ `objfw-config --cppflags --objcflags`
 
 test.exe : OGApplication.o OGWidget.o OGWindow.o OGBox.o OGVBox.o OGHBox.o OGButton.o OGComboBox.o OGComboBoxItem.o test.o
 	gcc -mwindows -o test.exe *.o `objfw-config --libs`