summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPietro Gagliardi <[email protected]>2014-07-18 00:29:15 -0400
committerPietro Gagliardi <[email protected]>2014-07-18 00:29:15 -0400
commit489ce0a0538c81ab6a10efd4b97cce6299fc4d81 (patch)
tree8da3208df2ff10861df944c8b6d43707c29c4ac5
parentd2f09a02225281fbd30fe068f228ca0f3fd26471 (diff)
Added #include "_cgo_export.h" to files that needed it and fixed a cast error in controls_windows.c that that revealed. Anyway buttons work now on all platforms, woo :D
-rw-r--r--redo/common_windows.c1
-rw-r--r--redo/controls_windows.c3
-rw-r--r--redo/sizing_windows.c1
-rw-r--r--redo/window_windows.c1
4 files changed, 5 insertions, 1 deletions
diff --git a/redo/common_windows.c b/redo/common_windows.c
index f12050c..e317595 100644
--- a/redo/common_windows.c
+++ b/redo/common_windows.c
@@ -1,6 +1,7 @@
// 17 july 2014
#include "winapi_windows.h"
+#include "_cgo_export.h"
LRESULT getWindowTextLen(HWND hwnd)
{
diff --git a/redo/controls_windows.c b/redo/controls_windows.c
index 77cf758..64bf273 100644
--- a/redo/controls_windows.c
+++ b/redo/controls_windows.c
@@ -1,6 +1,7 @@
/* 17 july 2014 */
#include "winapi_windows.h"
+#include "_cgo_export.h"
HWND newWidget(LPCWSTR class, DWORD style, DWORD extstyle)
{
@@ -49,7 +50,7 @@ static LRESULT CALLBACK buttonSubProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARA
switch (uMsg) {
case msgCOMMAND:
if (HIWORD(wParam) == BN_CLICKED) {
- buttonClicked(data);
+ buttonClicked((void *) data);
return 0;
}
return (*fv_DefSubclassProc)(hwnd, uMsg, wParam, lParam);
diff --git a/redo/sizing_windows.c b/redo/sizing_windows.c
index 0b1620b..2b0357d 100644
--- a/redo/sizing_windows.c
+++ b/redo/sizing_windows.c
@@ -1,6 +1,7 @@
/* 17 july 2014 */
#include "winapi_windows.h"
+#include "_cgo_export.h"
HDC getDC(HWND hwnd)
{
diff --git a/redo/window_windows.c b/redo/window_windows.c
index 02eaddd..4380094 100644
--- a/redo/window_windows.c
+++ b/redo/window_windows.c
@@ -1,6 +1,7 @@
/* 17 july 2014 */
#include "winapi_windows.h"
+#include "_cgo_export.h"
#define windowclass L"gouiwindow"