SDL: fix windows build

Author: chrisws

src/platform/sdl/editor.cpp

@@ -9,11 +9,10 @@
 #include "config.h"
 
 #include "common/sbapp.h"
-#include "ui/system.h"
 #include "ui/textedit.h"
-#include "platform/sdl/syswm.h"
+#include "platform/sdl/runtime.h"
 
-void onlineHelp(TextEditInput *widget) {
+void onlineHelp(Runtime *runtime, TextEditInput *widget) {
   char path[100];
   const char *nodeId = widget->getNodeId();
   if (nodeId != NULL && nodeId[0] != '0') {
@@ -27,7 +26,7 @@ void onlineHelp(TextEditInput *widget) {
       sprintf(path, "http://smallbasic.sf.net");
     }
   }
-  browseFile(path);
+  runtime->browseFile(path);
 }
 
 void System::editSource(strlib::String &loadPath) {
@@ -150,7 +149,7 @@ void System::editSource(strlib::String &loadPath) {
         break;
       case SB_KEY_F(2):
         redraw = false;
-        onlineHelp(editWidget);
+        onlineHelp((Runtime *)this, editWidget);
         break;
       case SB_KEY_F(5):
         saveFile(editWidget, loadPath);

src/platform/sdl/runtime.cpp

@@ -130,6 +130,10 @@ int Runtime::ask(const char *title, const char *prompt, bool cancel) {
   return buttonId;
 }
 
+void Runtime::browseFile(const char *url) {
+  ::browseFile(_window, url);
+}
+
 void Runtime::construct(const char *font, const char *boldFont) {
   logEntered();
   _state = kClosingState;

src/platform/sdl/runtime.h

@@ -23,6 +23,7 @@ struct Runtime : public System {
 
   void alert(const char *title, const char *message);
   int ask(const char *title, const char *prompt, bool cancel);
+  void browseFile(const char *url);
   void construct(const char *font, const char *boldFont);
   void debugStart(TextEditInput *edit, const char *file);
   void debugStep(TextEditInput *edit, TextEditHelpWidget *help, bool cont);

src/platform/sdl/syswm.cpp

@@ -19,6 +19,7 @@ void appLog(const char *format, ...);
 
 #if defined(_Win32)
 #include <SDL_syswm.h>
+#include <shellapi.h>
 
 void loadIcon(SDL_Window *window) {
   HINSTANCE handle = ::GetModuleHandle(NULL);
@@ -57,18 +58,12 @@ void launchDebug(const char *file) {
   }
 }
 
-#if defined(WIN32)
-#include <windows.h>
-#include <fltk/Window.h>
-#include <fltk/win32.h>
-#endif
-
-void browseFile(const char *url) {
+void browseFile(SDL_Window *window, const char *url) {
   SDL_SysWMinfo wminfo;
   SDL_VERSION(&wminfo.version);
   if (SDL_GetWindowWMInfo(window, &wminfo) == 1) {
     HWND hwnd = wminfo.info.win.window;
-    ShellExecute(hwnd, "open", url, 0, 0, SW_SHOWNORMAL);
+    ::ShellExecute(hwnd, "open", url, 0, 0, SW_SHOWNORMAL);
   }
 }
 
@@ -77,6 +72,7 @@ void browseFile(const char *url) {
 #include <errno.h>
 
 void loadIcon(SDL_Window *window) {
+  // handled via smallbasic.desktop
 }
 
 int getStartupFontSize(SDL_Window *window) {
@@ -105,7 +101,7 @@ void launchDebug(const char *file) {
   }
 }
 
-void browseFile(const char *url) {
+void browseFile(SDL_Window *window, const char *url) {
   if (fork() == 0) {
     const char *browser[] = {
       "sensible-browser",

src/platform/sdl/syswm.h

@@ -14,6 +14,6 @@
 void loadIcon(SDL_Window *window);
 int getStartupFontSize(SDL_Window *window);
 void launchDebug(const char *file);
-void browseFile(const char *url);
+void browseFile(SDL_Window *window, const char *url);
 
 #endif