Support window title in hello_world.py example on Mac (cztomczak#339)

cztomczak · cztomczak · commit 90452e39b76f · 2017-03-25T16:57:24.000+01:00
diff --git a/src/cefpython.pyx b/src/cefpython.pyx
@@ -813,7 +813,8 @@ def CreateBrowserSync(windowInfo=None,
         cef_window.get().RequestFocus()
         windowInfo = WindowInfo()
         windowInfo.SetAsChild(cef_window.get().GetWindowHandle())
-        Debug("CefWindow handle = "+str(cef_window.get().GetWindowHandle()))
+        Debug("CefWindow handle = "
+              +str(<uintptr_t>cef_window.get().GetWindowHandle()))
     """
 
     # Only title was set in hello_world.py example
@@ -881,7 +882,7 @@ def CreateBrowserSync(windowInfo=None,
         Debug("CefBrowser::CreateBrowserSync() succeeded")
 
     Debug("CefBrowser window handle = "
-          +str(cefBrowser.get().GetHost().get().GetWindowHandle()))
+          +str(<uintptr_t>cefBrowser.get().GetHost().get().GetWindowHandle()))
 
     # Request context - part 2/2.
     if g_applicationSettings["unique_request_context_per_browser"]:
@@ -910,7 +911,8 @@ def CreateBrowserSync(windowInfo=None,
             x11.SetX11WindowTitle(cefBrowser,
                                   PyStringToChar(windowInfo.windowName))
         ELIF UNAME_SYSNAME == "Darwin":
-            pass
+            MacSetWindowTitle(cefBrowser,
+                              PyStringToChar(windowInfo.windowName))
 
     return pyBrowser
 
diff --git a/src/client_handler/util_mac.h b/src/client_handler/util_mac.h
@@ -8,7 +8,9 @@
 #include <string>
 #include "include/cef_base.h"
 #include "include/cef_app.h"
+#include "include/cef_browser.h"
 
 void MacInitialize();
+void MacSetWindowTitle(CefRefPtr<CefBrowser> browser, char* title);
 
 #endif  // CEFPYTHON_UTIL_MAC_H_
diff --git a/src/client_handler/util_mac.mm b/src/client_handler/util_mac.mm
@@ -66,7 +66,8 @@ void MacInitialize() {
     [NSApplication sharedApplication];
 }
 
-void MacSetTitle(CefRefPtr<CefBrowser> browser, char* title) {
+void MacSetWindowTitle(CefRefPtr<CefBrowser> browser, char* title) {
     NSView* view = browser->GetHost()->GetWindowHandle();
-    view.window!.title = title;
+    NSString* nstitle = [NSString stringWithFormat:@"%s" , title];
+    view.window.title = nstitle;
 }
diff --git a/src/compile_time_constants.pxi b/src/compile_time_constants.pxi
@@ -1,3 +1,3 @@
 # This file was generated by setup.py
-DEF UNAME_SYSNAME = "Linux"
+DEF UNAME_SYSNAME = "Darwin"
 DEF PY_MAJOR_VERSION = 2
diff --git a/src/extern/mac.pxd b/src/extern/mac.pxd
@@ -2,5 +2,9 @@
 # All rights reserved. Licensed under BSD 3-clause license.
 # Project website: https://github.com/cztomczak/cefpython
 
+from cef_ptr cimport CefRefPtr
+from cef_browser cimport CefBrowser
+
 cdef extern from "client_handler/util_mac.h":
-    cdef void MacInitialize()
+    void MacInitialize()
+    void MacSetWindowTitle(CefRefPtr[CefBrowser] browser, char* title)

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,8 @@ void MacInitialize() {`
`66`	`66`	`[NSApplication sharedApplication];`
`67`	`67`	`}`
`68`	`68`
`69`		`-void MacSetTitle(CefRefPtr<CefBrowser> browser, char* title) {`
	`69`	`+void MacSetWindowTitle(CefRefPtr<CefBrowser> browser, char* title) {`
`70`	`70`	`NSView* view = browser->GetHost()->GetWindowHandle();`
`71`		`- view.window!.title = title;`
	`71`	`+ NSString* nstitle = [NSString stringWithFormat:@"%s" , title];`
	`72`	`+ view.window.title = nstitle;`
`72`	`73`	`}`