Mercurial > hg > toolkit / changeset

--- a/ui/cocoa/resource.m	Fri Apr 11 17:02:19 2014 +0200
+++ b/ui/cocoa/resource.m	Fri Apr 11 21:45:24 2014 +0200
@@ -31,19 +31,28 @@
 #import <string.h>
 
 #import "resource.h"
+#import "../common/properties.h"
 
 
 
-void ui_load_lang(char *locale) {
+void ui_load_lang_def(char *locale, char *default_locale) {
     NSString *localeString = nil;
     if(locale) {
         localeString = [[NSString alloc]initWithUTF8String:locale];
     } else {
-        localeString = @"en_EN";
+        localeString = [[NSString alloc]initWithUTF8String:default_locale];
     }
     
     NSString *path = [[NSBundle mainBundle] pathForResource:localeString ofType:@"properties" inDirectory:@"locales"];
     
     const char *p = [path UTF8String];
-    uic_load_language_file(p);
+    uic_load_language_file((char*)p);
 }
+
+void ui_locales_dir(char *path) {
+    // empty
+}
+
+void ui_pixmaps_dir(char *path) {
+    // empty
+}
\ No newline at end of file

--- a/ui/cocoa/stock.m	Fri Apr 11 17:02:19 2014 +0200
+++ b/ui/cocoa/stock.m	Fri Apr 11 21:45:24 2014 +0200
@@ -30,6 +30,7 @@
 #import <stdlib.h>
 
 #import "stock.h"
+#import "../common/properties.h"
 
 static UcxMap *stock_items;
 

--- a/ui/cocoa/toolkit.m	Fri Apr 11 17:02:19 2014 +0200
+++ b/ui/cocoa/toolkit.m	Fri Apr 11 21:45:24 2014 +0200
@@ -202,6 +202,7 @@
     NSWindow *activeWindow = [NSApp keyWindow];
     
     UiEvent event;
+    event.eventdata = NULL;
     if([activeWindow class] == [UiCocoaWindow class]) {
         event.obj = [(UiCocoaWindow*)activeWindow object];
         event.window = event.obj->window;
@@ -222,6 +223,7 @@
     
     UiEvent event;
     event.intval = state;
+    event.eventdata = NULL;
     if([activeWindow class] == [UiCocoaWindow class]) {
         event.obj = [(UiCocoaWindow*)activeWindow object];
         event.window = event.obj->window;