Updated Linux setup installer to include wx subpackage.

cztomczak · cztomczak · commit 16b39c920f18 · 2013-05-09T17:27:45.000+02:00
Updated README.txt for the setup.
diff --git a/cefpython/cef1/linux/binaries/wxpython.py b/cefpython/cef1/linux/binaries/wxpython.py
@@ -94,10 +94,6 @@ def __init__(self):
             browserSettings={"plugins_disabled": True},
             navigateUrl="file://"+GetApplicationPath("cefsimple.html"))
 
-        # Remains of OS_WIN code:
-        #self.Bind(wx.EVT_SET_FOCUS, self.OnSetFocus)
-        #self.Bind(wx.EVT_SIZE, self.OnSize)
-
         self.Bind(wx.EVT_CLOSE, self.OnClose)
         if USE_EVT_IDLE:
             # Bind EVT_IDLE only for the main application frame.
@@ -114,14 +110,6 @@ def CreateMenu(self):
         menubar.Append(aboutmenu, "&About")
         self.SetMenuBar(menubar)
 
-    def OnSetFocus(self, event):
-        #cefpython.WindowUtils.OnSetFocus(self.GetWindowHandle(), 0, 0, 0)
-        pass
-
-    def OnSize(self, event):
-        #cefpython.WindowUtils.OnSize(self.GetWindowHandle(), 0, 0, 0)
-        pass
-
     def OnClose(self, event):
         self.browser.CloseBrowser()
         self.Destroy()
diff --git a/cefpython/cef1/linux/installer/README.txt.template b/cefpython/cef1/linux/installer/README.txt.template
@@ -2,8 +2,22 @@
    
        sudo python setup.py install
 
-2. Go to /usr/local/lib/python2.7/dist-packages/cefpython1/examples/
-   and run some examples:
-       
+       This will install cefpython1 package to
+       /usr/local/lib/python2.7/dist-packages/
+
+2. In the same directory that setup.py resides there is 
+   an examples/ directory, run some example scripts from there:
+
+       cd examples/
        python wxpython.py
        python pygtk_.py
+       cd wx/
+       python sample1.py
+       python sample2.py
+       python sample3.py
+
+Note:
+    Examples directory can also be found in package's directory:
+    /usr/local/lib/python2.7/dist-packages/cefpython1/examples/
+    But to run examples from there you would have to chmod 0777
+    the examples/ directory as it needs permission to create log files.
diff --git a/cefpython/cef1/linux/installer/__init__.py.template b/cefpython/cef1/linux/installer/__init__.py.template
@@ -8,8 +8,5 @@ if 0x02070000 <=  sys.hexversion < 0x03000000:
 else:
     raise Exception("Unsupported python version: " + sys.version)
 
-cefpython.locales_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "locales")
-cefpython.resources_dir = os.path.dirname(os.path.abspath(__file__))
-
 __version__ = "v53"
 __author__ = "CEF Python authors"
diff --git a/cefpython/cef1/linux/installer/setup.py.template b/cefpython/cef1/linux/installer/setup.py.template
@@ -8,14 +8,19 @@ setup(
     author='Czarek Tomczak',
     author_email='czarek.tomczak@gmail.com',
     url='http://code.google.com/p/cefpython/',
-    packages=['cefpython1'],
+    packages=['cefpython1', 'cefpython1.wx'],
     package_data={'cefpython1': [
         'examples/*.py',
         'examples/*.html',
+        'examples/wx/*.py',
+        'examples/wx/*.html',
+        'examples/wx/*.png',
         'locales/*.pak',
+        'wx/*.txt',
+        'wx/images/*.png',
         '*.txt',
         'cefclient',
         '*.so',
-        '*.pak'
+        '*.pak',
     ]}
 )
