CEF 1 compilation fix.

cztomczak · cztomczak · commit bea09748e62c · 2013-03-18T14:33:02.000-07:00
CEF 1 dummy api script updated.

Off-screen rendering error fixed when rendering a popup.
diff --git a/cefpython/browser.pyx b/cefpython/browser.pyx
@@ -432,7 +432,7 @@ cdef class PyBrowser:
                 self.gwlStyle = GetWindowLong(hwnd, GWL_STYLE)
                 self.gwlExStyle = GetWindowLong(hwnd, GWL_EXSTYLE)
                 GetWindowRect(hwnd, &rect)
-                self.windowRect = (rect.left, rect.top, 
+                self.windowRect = (rect.left, rect.top,
                                   rect.right, rect.bottom)
 
             cdef int removeStyle, removeExStyle
@@ -456,7 +456,7 @@ cdef class PyBrowser:
                     top = monitorInfo.rcMonitor.top
                     right = monitorInfo.rcMonitor.right
                     bottom = monitorInfo.rcMonitor.bottom
-                    SetWindowPos(hwnd, NULL, 
+                    SetWindowPos(hwnd, NULL,
                             left, top, right-left, bottom-top,
                             SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED)
             else:
@@ -490,7 +490,7 @@ cdef class PyBrowser:
             if ret:
                 return (width, height)
             else:
-                return ()
+                return (0, 0)
 
         cpdef py_void SetSize(self, PaintElementType paintElementType,
                               int width, int height):
diff --git a/cefpython/cef1/windows/binaries/cefpython_py27.py b/cefpython/cef1/windows/binaries/cefpython_py27.py
@@ -41,6 +41,9 @@ def QuitMessageLoop():
 def Shutdown():
     return None
 
+def GetModuleDirectory():
+    return ""
+
 #
 # Settings
 #
@@ -805,7 +808,7 @@ def RenderHandler_OnPopupShow(browser, show):
 def RenderHandler_OnPopupSize(browser, rect):
     return None
 
-def RenderHandler_OnPaint(browser, paintElementType, out_dirtyRects, 
+def RenderHandler_OnPaint(browser, paintElementType, out_dirtyRects,
         paintBuffer):
     return None
 
diff --git a/cefpython/cef1/windows/binaries/panda3d_.py b/cefpython/cef1/windows/binaries/panda3d_.py
@@ -1,7 +1,7 @@
 # CEF off-screen rendering using the Panda3D game engine:
 # http://www.panda3d.org/
 
-# You need panda3D runtime that is compatible with python 2.7,
+# You need panda3D SDK that is compatible with python 2.7,
 # version 1.8.0 comes by default with python 2.7.
 
 # To use custom python (not the one provided with the SDK)
@@ -327,7 +327,12 @@ def __init__(self, browser, texture):
     def OnPaint(self, browser, paintElementType, dirtyRects, buffer):
         (width, height) = self.browser.GetSize(paintElementType)
         img = self.texture.modifyRamImage()
-        img.setData(buffer.GetString(mode="bgra", origin="bottom-left"))
+        if paintElementType == cefpython.PET_POPUP:
+            print("width=%s, height=%s" % (width, height))
+        elif paintElementType == cefpython.PET_VIEW:
+            img.setData(buffer.GetString(mode="bgra", origin="bottom-left"))
+        else:
+            raise Exception("Unknown paintElementType: %s" % paintElementType)
 
     def GetViewRect(self, browser, rect):
         return False
diff --git a/cefpython/cef1_api.py b/cefpython/cef1_api.py
@@ -41,6 +41,9 @@ def QuitMessageLoop():
 def Shutdown():
     return None
 
+def GetModuleDirectory():
+    return ""
+
 #
 # Settings
 #
@@ -805,7 +808,7 @@ def RenderHandler_OnPopupShow(browser, show):
 def RenderHandler_OnPopupSize(browser, rect):
     return None
 
-def RenderHandler_OnPaint(browser, paintElementType, out_dirtyRects, 
+def RenderHandler_OnPaint(browser, paintElementType, out_dirtyRects,
         paintBuffer):
     return None
 
diff --git a/cefpython/cython_includes/cef_types_wrappers.pxd b/cefpython/cython_includes/cef_types_wrappers.pxd
@@ -6,7 +6,8 @@ include "compile_time_constants.pxi"
 
 from libcpp cimport bool as cpp_bool
 from cef_string cimport cef_string_t
-from cef_types cimport cef_state_t
+IF CEF_VERSION == 3:
+      from cef_types cimport cef_state_t
 
 cdef extern from "include/internal/cef_types_wrappers.h":
 
