Mercurial > godwindows

changeset 74:6f96694ec425

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More CamelCasing of the source code to be more Go-like.
author Brian Smith <brian@dbsoft.org>
date Fri, 22 Mar 2013 14:29:26 -0500
parents 8062f4e54925
children 472be5d8da2f
files src/dw/dw.go src/dwibtest/dwibtest.go src/dwootest/dwootest.go
diffstat 3 files changed, 26 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/dw/dw.go	Fri Mar 22 14:06:33 2013 -0500
+++ b/src/dw/dw.go	Fri Mar 22 14:29:26 2013 -0500
@@ -826,6 +826,10 @@
     return int(C.go_messagebox(ctitle, C.int(flags), cmessage));
 }
 
+func MessageBox(title string, flags int, message string) int {
+    return Messagebox(title, flags, message);
+}
+
 func Window_new(owner HWND, title string, flags uint) HWND {
     ctitle := C.CString(title);
     defer C.free(unsafe.Pointer(ctitle));
@@ -2070,14 +2074,26 @@
     C.dw_main_iteration();
 }
 
+func MainIteration() {
+    Main_iteration();
+}
+
 func Main_quit() {
     C.dw_main_quit();
 }
 
+func MainQuit() {
+    Main_quit();
+}
+
 func Main_sleep(milliseconds int) {
     C.dw_main_sleep(C.int(milliseconds));
 }
 
+func MainSleep(milliseconds int) {
+    Main_sleep(milliseconds);
+}
+
 func Box_new(btype int, pad int) HBOX {
     return HBOX{C.go_box_new(C.int(btype), C.int(pad))};
 }
--- a/src/dwibtest/dwibtest.go	Fri Mar 22 14:06:33 2013 -0500
+++ b/src/dwibtest/dwibtest.go	Fri Mar 22 14:29:26 2013 -0500
@@ -18,9 +18,9 @@
 
 /* Handle exiting the application */
 func exit_handler() int {
-    if dw.Messagebox(APP_NAME, dw.MB_YESNO | dw.MB_QUESTION, "Are you sure you want to exit?") == dw.MB_RETURN_YES {
+    if dw.MessageBox(APP_NAME, dw.MB_YESNO | dw.MB_QUESTION, "Are you sure you want to exit?") == dw.MB_RETURN_YES {
         /* Exit the application cleanly */
-        dw.Main_quit();
+        dw.MainQuit();
     }
     return TRUE;
 }
--- a/src/dwootest/dwootest.go	Fri Mar 22 14:06:33 2013 -0500
+++ b/src/dwootest/dwootest.go	Fri Mar 22 14:29:26 2013 -0500
@@ -99,8 +99,8 @@
 
 // Call back section
 func exit_handler() int {
-   if dw.Messagebox("dwtest", dw.MB_YESNO | dw.MB_QUESTION, "Are you sure you want to exit?") != 0 {
-      dw.Main_quit();
+   if dw.MessageBox("dwtest", dw.MB_YESNO | dw.MB_QUESTION, "Are you sure you want to exit?") != 0 {
+      dw.MainQuit();
    }
    return dw.TRUE;
 }
@@ -397,7 +397,7 @@
                   spvalue,
                   buf1, buf2,
                   y, m, d);
-    dw.Messagebox( "Values", dw.MB_OK | dw.MB_INFORMATION, message);
+    dw.MessageBox( "Values", dw.MB_OK | dw.MB_INFORMATION, message);
 }
 
 // Create the menu
@@ -414,11 +414,11 @@
 
     changeable_menu := dw.MenuNew(0);
     checkable_menuitem := changeable_menu.AppendItem("~Checkable Menu Item", dw.MENU_AUTO, 0, dw.TRUE, dw.TRUE, dw.NOMENU);
-    checkable_menuitem.ConnectClicked(func(window dw.HMENUITEM) int { dw.Messagebox("Menu Item Callback", dw.MB_OK | dw.MB_INFORMATION, "Checkable menu item selected"); return dw.FALSE });
+    checkable_menuitem.ConnectClicked(func(window dw.HMENUITEM) int { dw.MessageBox("Menu Item Callback", dw.MB_OK | dw.MB_INFORMATION, "Checkable menu item selected"); return dw.FALSE });
 
 
     noncheckable_menuitem := changeable_menu.AppendItem("~Non-checkable Menu Item", dw.MENU_AUTO, 0, dw.TRUE, dw.FALSE, dw.NOMENU);
-    noncheckable_menuitem.ConnectClicked(func(window dw.HMENUITEM) int { dw.Messagebox("Menu Item Callback", dw.MB_OK | dw.MB_INFORMATION, "Non-checkable menu item selected"); return dw.FALSE });
+    noncheckable_menuitem.ConnectClicked(func(window dw.HMENUITEM) int { dw.MessageBox("Menu Item Callback", dw.MB_OK | dw.MB_INFORMATION, "Non-checkable menu item selected"); return dw.FALSE });
     changeable_menu.AppendItem("~Disabled menu Item", dw.MENU_AUTO, dw.MIS_DISABLED | dw.MIS_CHECKED, dw.TRUE, dw.TRUE, dw.NOMENU);
     /* seperator */
     changeable_menu.AppendItem(dw.MENU_SEPARATOR, dw.MENU_AUTO, 0, dw.TRUE, dw.FALSE, dw.NOMENU);
@@ -450,7 +450,7 @@
                                                           env.OSName, env.BuildDate, env.BuildTime,
                                                           env.MajorVersion, env.MinorVersion, env.MajorBuild, env.MinorBuild,
                                                           env.DWMajorVersion, env.DWMinorVersion, env.DWSubVersion);
-                                dw.Messagebox("About dwindows", dw.MB_OK | dw.MB_INFORMATION, message);
+                                dw.MessageBox("About dwindows", dw.MB_OK | dw.MB_INFORMATION, message);
                                 return dw.FALSE;
                             });
 
@@ -696,7 +696,7 @@
         image.SetTransparentColor(dw.CLR_WHITE);
     }
 
-    dw.Messagebox("DWTest", dw.MB_OK | dw.MB_INFORMATION, fmt.Sprintf("Width: %d Height: %d\n", font_width, font_height));
+    dw.MessageBox("DWTest", dw.MB_OK | dw.MB_INFORMATION, fmt.Sprintf("Width: %d Height: %d\n", font_width, font_height));
     text1pm.DrawRect(dw.DRAW_FILL | dw.DRAW_NOAA, 0, 0, font_width * width1, font_height * rows);
     text2pm.DrawRect(dw.DRAW_FILL | dw.DRAW_NOAA, 0, 0, font_width * cols, font_height * rows);
     textbox1.ConnectButtonPress(func(window dw.HRENDER, x int, y int, buttonmask int) int { context_menu(); return dw.TRUE; });
@@ -1026,7 +1026,7 @@
                                     iteration++;
                                     return dw.FALSE;
                                 });
-    spinbutton.ConnectValueChanged(func(hwnd dw.HSPINBUTTON, value int) int { dw.Messagebox("DWTest", dw.MB_OK, fmt.Sprintf("New value from spinbutton: %d\n", value)); return dw.FALSE; });
+    spinbutton.ConnectValueChanged(func(hwnd dw.HSPINBUTTON, value int) int { dw.MessageBox("DWTest", dw.MB_OK, fmt.Sprintf("New value from spinbutton: %d\n", value)); return dw.FALSE; });
     slider.ConnectValueChanged(func(hwnd dw.HSLIDER, value int) int { percent.SetPos(uint(value * 10)); return dw.FALSE; });
 }