Windows: Fixed build issues and widget initialization

skyjake · Jun 4, 2013 · 758fa49 · 758fa49
1 parent 6d4da2f
commit 758fa49
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 16 deletions.
diff --git a/doomsday/client/include/de_platform.h b/doomsday/client/include/de_platform.h
@@ -53,7 +53,7 @@
 
 #define stricmp _stricmp
 #define strnicmp _strnicmp
-#define open _open
+//#define open _open
 //#define close _close
 //#define read _read
 //#define write _write

diff --git a/doomsday/client/src/m_misc.cpp b/doomsday/client/src/m_misc.cpp
@@ -23,6 +23,8 @@
 
 // HEADER FILES ------------------------------------------------------------
 
+#include "de_platform.h"
+
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
@@ -31,6 +33,10 @@
 #  include <direct.h>
 #  include <io.h>
 #  include <conio.h>
+#  ifndef O_BINARY
+#    define O_BINARY 0
+#  endif
+#  define open _open
 #endif
 
 #if defined(UNIX)
@@ -42,7 +48,6 @@
 #include <ctype.h>
 #include <math.h>
 
-#include "de_platform.h"
 #include "de_base.h"
 #include "de_console.h"
 #include "de_system.h"
@@ -256,10 +261,6 @@ int M_BoxOnLineSide2(const AABoxd* box, double const linePoint[], double const l
 #undef NORMALIZE
 }
 
-#ifndef O_BINARY
-#  define O_BINARY 0
-#endif
-
 DENG_EXTERN_C boolean M_WriteFile(const char* name, const char* source, size_t length)
 {
     int handle = open(name, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0666);

diff --git a/doomsday/client/src/ui/widgets/busywidget.cpp b/doomsday/client/src/ui/widgets/busywidget.cpp
@@ -63,6 +63,8 @@ void BusyWidget::viewResized()
 
 void BusyWidget::update()
 {
+    GuiWidget::update();
+
     DENG_ASSERT(BusyMode_Active());
     BusyMode_Loop();
 }

diff --git a/doomsday/client/src/ui/widgets/guirootwidget.cpp b/doomsday/client/src/ui/widgets/guirootwidget.cpp
@@ -169,8 +169,11 @@ void GuiRootWidget::routeMouse(Widget *routeTo)
 
 void GuiRootWidget::update()
 {
-    // Allow GL operations.
-    window().canvas().makeCurrent();
+    if(window().canvas().isGLReady())
+    {
+        // Allow GL operations.
+        window().canvas().makeCurrent();
 
-    RootWidget::update();
+        RootWidget::update();
+    }
 }
diff --git a/doomsday/client/src/ui/widgets/guiwidget.cpp b/doomsday/client/src/ui/widgets/guiwidget.cpp
@@ -202,7 +202,7 @@ void GuiWidget::update()
 
 void GuiWidget::drawIfVisible()
 {
-    if(!isHidden())
+    if(!isHidden() && d->inited)
     {
         if(clipped())
         {

diff --git a/doomsday/client/src/ui/widgets/legacywidget.cpp b/doomsday/client/src/ui/widgets/legacywidget.cpp
@@ -83,6 +83,8 @@ void LegacyWidget::viewResized()
 
 void LegacyWidget::update()
 {    
+    GuiWidget::update();
+
     if(isDisabled()) return;
 
     //LOG_DEBUG("Legacy update");

diff --git a/doomsday/plugins/common/src/hu_menu.c b/doomsday/plugins/common/src/hu_menu.c
@@ -6467,12 +6467,14 @@ D_CMD(MenuOpen)
             return true;
         }
 
-        mn_page_t* page = Hu_MenuFindPageByName(argv[1]);
-        if(page)
         {
-            Hu_MenuCommand(MCMD_OPEN);
-            Hu_MenuSetActivePage(page);
-            return true;
+            mn_page_t* page = Hu_MenuFindPageByName(argv[1]);
+            if(page)
+            {
+                Hu_MenuCommand(MCMD_OPEN);
+                Hu_MenuSetActivePage(page);
+                return true;
+            }
         }
         return false;
     }

diff --git a/doomsday/tests/test_glsandbox/testwindow.cpp b/doomsday/tests/test_glsandbox/testwindow.cpp
@@ -234,7 +234,7 @@ DENG2_OBSERVES(Bank, Load)
 
             self.canvas().makeCurrent();
             testpic.setImage(imageBank.image(path));
-            self.canvas().doneCurrent();
+            //self.canvas().doneCurrent();
 
             imageBank.unload(path);
         }