X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpython.hh;h=c1655503fafc25dc37dffa20c5577e4d23d97f71;hb=7d215bd255d0744101b9ceb52c235bdc985fa034;hp=f1d701a81c8804303b6d4d2b1a37916a1210858b;hpb=93ea4c4d2ea2b1ff3dfee40fb114f3080001e4ce;p=chaz%2Fopenbox

diff --git a/src/python.hh b/src/python.hh
index f1d701a8..c1655503 100644
--- a/src/python.hh
+++ b/src/python.hh
@@ -19,6 +19,7 @@ extern "C" {
 #include <string>
 #include <vector>
 
+
 namespace ob {
 
 class Client;
@@ -37,7 +38,7 @@ struct MouseContext {
     Grip,
     Root,
     MenuItem
-#if ! (defined(DOXYGEN_IGNORE) || defined(SWIG))
+#ifndef DOXYGEN_IGNORE
     , NUM_MOUSE_CONTEXT
 #endif
   };
@@ -50,7 +51,7 @@ struct MouseAction {
     Click,
     DoubleClick,
     Motion
-#if ! (defined(DOXYGEN_IGNORE) || defined(SWIG))
+#ifndef DOXYGEN_IGNORE
     , NUM_MOUSE_ACTION
 #endif
   };
@@ -60,7 +61,7 @@ struct KeyContext {
   enum KC {
     Menu,
     All
-#if ! (defined(DOXYGEN_IGNORE) || defined(SWIG))
+#ifndef DOXYGEN_IGNORE
     , NUM_KEY_CONTEXT
 #endif
   };
@@ -70,7 +71,7 @@ struct KeyAction {
   enum KA {
     Press,
     Release
-#if ! (defined(DOXYGEN_IGNORE) || defined(SWIG))
+#ifndef DOXYGEN_IGNORE
     , NUM_KEY_ACTION
 #endif
   };
@@ -120,7 +121,7 @@ struct EventAction {
       The Client::urgent method can be used to get the status.
     */
     UrgentWindow
-#if ! (defined(DOXYGEN_IGNORE) || defined(SWIG))
+#ifndef DOXYGEN_IGNORE
     , NUM_EVENT_ACTION
 #endif
   };
@@ -227,14 +228,14 @@ typedef void (*MouseCallback)(MouseData*, void*);
 typedef void (*KeyCallback)(KeyData*, void*);
 typedef void (*EventCallback)(EventData*, void*);
 
-#ifndef SWIG
-
 void python_init(char *argv0);
 void python_destroy();
 //! Returns 0 for success, 1 for failing to open the file, 2 for an exception
 int python_exec(const std::string &path);
 
-#endif // SWIG
+bool python_get_long(const char *name, long *value);
+bool python_get_string(const char *name, otk::ustring *value);
+bool python_get_stringlist(const char *name, std::vector<otk::ustring> *value);
 
 }