demo tweaks

[wxWidgets.git] / wxPython / src / _functions.i

diff --git a/wxPython/src/_functions.i b/wxPython/src/_functions.i
index 241ad3d5fd82e729f941d28c7a55cde58114c636..aa33a105b9fe51395ec9e05306aa946231777417 100644 (file)
--- a/wxPython/src/_functions.i
+++ b/wxPython/src/_functions.i
@@ -15,11 +15,9 @@
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-%{
-    DECLARE_DEF_STRING(FileSelectorPromptStr);
-    DECLARE_DEF_STRING(FileSelectorDefaultWildcardStr);
-    DECLARE_DEF_STRING(DirSelectorPromptStr);
-%}
+MAKE_CONST_WXSTRING(FileSelectorPromptStr);
+MAKE_CONST_WXSTRING(FileSelectorDefaultWildcardStr);
+MAKE_CONST_WXSTRING(DirSelectorPromptStr);

 
 //---------------------------------------------------------------------------
 %newgroup;
 
 //---------------------------------------------------------------------------
 %newgroup;


@@ -54,7 +52,7 @@ long wxGetFreeMemory();
 #else
 %inline %{
     long wxGetFreeMemory()
 #else
 %inline %{
     long wxGetFreeMemory()

-        { PyErr_SetNone(PyExc_NotImplementedError); return 0; }
+        { wxPyRaiseNotImplemented(); return 0; }

 %}
 #endif
 
 %}
 #endif
 


@@ -216,6 +214,11 @@ wxWindow* wxGetTopLevelParent(wxWindow *win);
 // This is generally most useful getting the state of
 // Caps Lock, Num Lock and Scroll Lock...
 bool wxGetKeyState(wxKeyCode key);
 // This is generally most useful getting the state of
 // Caps Lock, Num Lock and Scroll Lock...
 bool wxGetKeyState(wxKeyCode key);

+#else
+%inline %{
+    bool wxGetKeyState(wxKeyCode key)
+        {  wxPyRaiseNotImplemented(); return False; }
+%}

 #endif
 
 
 #endif