Added wxRTTI for the new wxVScrolledWindow, wxVListBox, and

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

diff --git a/wxPython/src/misc2.i b/wxPython/src/misc2.i
index a5bce532e4688711bc3a3ce2f630798b0cfeb2a4..47081cb1cb6a503a9a52d86c676ad1bb3176205d 100644 (file)
--- a/wxPython/src/misc2.i
+++ b/wxPython/src/misc2.i
@@ -17,7 +17,6 @@
 %{
 #include "helpers.h"
 #include "pyistream.h"
 %{
 #include "helpers.h"
 #include "pyistream.h"

-#include <wx/resource.h>

 #include <wx/tooltip.h>
 #include <wx/caret.h>
 #include <wx/tipdlg.h>
 #include <wx/tooltip.h>
 #include <wx/caret.h>
 #include <wx/tipdlg.h>


@@ -32,6 +31,9 @@
 #endif
 
 #include <wx/mimetype.h>
 #endif
 
 #include <wx/mimetype.h>

+#include <wx/snglinst.h>
+#include <wx/effects.h>
+#include <wx/sysopt.h>

 %}
 
 //----------------------------------------------------------------------
 %}
 
 //----------------------------------------------------------------------


@@ -71,6 +73,9 @@ wxString wxFileSelector(const wxString& message = wxPyFileSelectorPromptStr,
                         wxWindow *parent = NULL,
                         int x = -1, int y = -1);
 
                         wxWindow *parent = NULL,
                         int x = -1, int y = -1);
 

+// TODO: wxFileSelectorEx
+
+

 // Ask for filename to load
 wxString wxLoadFileSelector(const wxString& what,
                             const wxString& extension,
 // Ask for filename to load
 wxString wxLoadFileSelector(const wxString& what,
                             const wxString& extension,


@@ -170,14 +175,17 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt);
 
 #ifdef __WXMSW__
 bool wxCheckForInterrupt(wxWindow *wnd);
 
 #ifdef __WXMSW__
 bool wxCheckForInterrupt(wxWindow *wnd);

-void wxFlushEvents();
+// link error? void wxFlushEvents();

 #endif
 
 wxWindow* wxGetTopLevelParent(wxWindow *win);
 
 #endif
 
 wxWindow* wxGetTopLevelParent(wxWindow *win);
 

+//bool wxSpawnBrowser(wxWindow *parent, wxString href);
+

 //---------------------------------------------------------------------------
 // Resource System
 
 //---------------------------------------------------------------------------
 // Resource System
 

+#ifdef wxUSE_WX_RESOURCES

 bool wxResourceAddIdentifier(char* name, int value);
 void wxResourceClear(void);
 wxBitmap  wxResourceCreateBitmap(char* resource);
 bool wxResourceAddIdentifier(char* name, int value);
 void wxResourceClear(void);
 wxBitmap  wxResourceCreateBitmap(char* resource);


@@ -187,6 +195,7 @@ int wxResourceGetIdentifier(char* name);
 bool wxResourceParseData(char* resource, wxResourceTable *table = NULL);
 bool wxResourceParseFile(char* filename, wxResourceTable *table = NULL);
 bool wxResourceParseString(char* resource, wxResourceTable *table = NULL);
 bool wxResourceParseData(char* resource, wxResourceTable *table = NULL);
 bool wxResourceParseFile(char* filename, wxResourceTable *table = NULL);
 bool wxResourceParseString(char* resource, wxResourceTable *table = NULL);

+#endif

 
 //---------------------------------------------------------------------------
 // System Settings
 
 //---------------------------------------------------------------------------
 // System Settings


@@ -336,6 +345,23 @@ public:
 
 
 
 
 
 

+class wxSystemOptions : public wxObject
+{
+public:
+    wxSystemOptions() { }
+
+    // User-customizable hints to wxWindows or associated libraries
+    // These could also be used to influence GetSystem... calls, indeed
+    // to implement SetSystemColour/Font/Metric
+
+    static void SetOption(const wxString& name, const wxString& value);
+    %name(SetOptionInt)static void SetOption(const wxString& name, int value);
+    static wxString GetOption(const wxString& name) ;
+    static int GetOptionInt(const wxString& name) ;
+    static bool HasOption(const wxString& name) ;
+};
+
+

 //---------------------------------------------------------------------------
 // wxToolTip
 
 //---------------------------------------------------------------------------
 // wxToolTip
 


@@ -372,6 +398,8 @@ public:
     void SetSize(const wxSize& size);
     void Show(int show = TRUE);
     void Hide();
     void SetSize(const wxSize& size);
     void Show(int show = TRUE);
     void Hide();

+
+    %pragma(python) addtoclass = "def __nonzero__(self): return self.IsOk()"

 };
 
 %inline %{
 };
 
 %inline %{


@@ -402,7 +430,7 @@ public:
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

-bool wxSafeYield(wxWindow* win=NULL);
+bool wxSafeYield(wxWindow* win=NULL, bool onlyIfNeeded=FALSE);

 void wxPostEvent(wxEvtHandler *dest, wxEvent& event);
 void wxWakeUpIdle();
 
 void wxPostEvent(wxEvtHandler *dest, wxEvent& event);
 void wxWakeUpIdle();
 


@@ -443,7 +471,7 @@ public:
 
     virtual wxString GetTip() = 0;
     size_t GetCurrentTip();
 
     virtual wxString GetTip() = 0;
     size_t GetCurrentTip();

-
+    virtual wxString PreprocessTip(const wxString& tip);

 };
 
 
 };
 
 


@@ -455,12 +483,12 @@ public:
         : wxTipProvider(currentTip) {}
 
     DEC_PYCALLBACK_STRING__pure(GetTip);
         : wxTipProvider(currentTip) {}
 
     DEC_PYCALLBACK_STRING__pure(GetTip);

-
+    DEC_PYCALLBACK_STRING_STRING(PreprocessTip);

     PYPRIVATE;
 };
 
 IMP_PYCALLBACK_STRING__pure( wxPyTipProvider, wxTipProvider, GetTip);
     PYPRIVATE;
 };
 
 IMP_PYCALLBACK_STRING__pure( wxPyTipProvider, wxTipProvider, GetTip);

-
+IMP_PYCALLBACK_STRING_STRING(wxPyTipProvider, wxTipProvider, PreprocessTip);

 %}
 
 
 %}
 
 


@@ -504,8 +532,10 @@ public:
     bool BeginDrag(const wxPoint& hotspot, wxWindow* window,
                    bool fullScreen = FALSE, wxRect* rect = NULL);
 
     bool BeginDrag(const wxPoint& hotspot, wxWindow* window,
                    bool fullScreen = FALSE, wxRect* rect = NULL);
 

-    %name(BeginDrag2) bool BeginDrag(const wxPoint& hotspot, wxWindow* window,
-                                     wxWindow* fullScreenRect);
+    %name(BeginDragBounded) bool BeginDrag(const wxPoint& hotspot, wxWindow* window,
+                                           wxWindow* boundingWindow);
+
+    %pragma(python) addtoclass = "BeginDrag2 = BeginDragBounded"

 
     bool EndDrag();
     bool Move(const wxPoint& pt);
 
     bool EndDrag();
     bool Move(const wxPoint& pt);


@@ -528,7 +558,7 @@ public:
     bool IsOneShot();
     bool IsRunning();
     void SetOwner(wxEvtHandler *owner, int id = -1);
     bool IsOneShot();
     bool IsRunning();
     void SetOwner(wxEvtHandler *owner, int id = -1);

-    void Start(int milliseconds=-1, int oneShot=FALSE);
+    bool Start(int milliseconds=-1, int oneShot=FALSE);

     void Stop();
 };
 
     void Stop();
 };
 


@@ -598,8 +628,6 @@ public:
     static void OnLog(unsigned long level, const wxString& szString, int t=0);
 
     virtual void Flush();
     static void OnLog(unsigned long level, const wxString& szString, int t=0);
 
     virtual void Flush();

-    bool HasPendingMessages() const;
-

     static void FlushActive();
     static wxLog *GetActiveTarget();
     static wxLog *SetActiveTarget(wxLog *pLogger);
     static void FlushActive();
     static wxLog *GetActiveTarget();
     static wxLog *SetActiveTarget(wxLog *pLogger);


@@ -614,6 +642,7 @@ public:
     static void AddTraceMask(const wxString& str);
     static void RemoveTraceMask(const wxString& str);
     static void ClearTraceMasks();
     static void AddTraceMask(const wxString& str);
     static void RemoveTraceMask(const wxString& str);
     static void ClearTraceMasks();

+    static const wxArrayString &GetTraceMasks();

 
     static void SetTimestamp(const wxString& ts);
     static const wxString& GetTimestamp();
 
     static void SetTimestamp(const wxString& ts);
     static const wxString& GetTimestamp();


@@ -623,6 +652,10 @@ public:
     static unsigned long GetTraceMask();
     static bool IsAllowedTraceMask(const wxString& mask);
 
     static unsigned long GetTraceMask();
     static bool IsAllowedTraceMask(const wxString& mask);
 

+    static void SetLogLevel(unsigned long logLevel);
+    static unsigned long GetLogLevel();
+
+

     // static void TimeStamp(wxString *str);
     %addmethods {
         wxString TimeStamp() {
     // static void TimeStamp(wxString *str);
     %addmethods {
         wxString TimeStamp() {


@@ -689,6 +722,7 @@ void wxLogError(const wxString& msg);
 void wxLogWarning(const wxString& msg);
 void wxLogMessage(const wxString& msg);
 void wxLogInfo(const wxString& msg);
 void wxLogWarning(const wxString& msg);
 void wxLogMessage(const wxString& msg);
 void wxLogInfo(const wxString& msg);

+void wxLogDebug(const wxString& msg);

 void wxLogVerbose(const wxString& msg);
 void wxLogStatus(const wxString& msg);
 %name(wxLogStatusFrame)void wxLogStatus(wxFrame *pFrame, const wxString& msg);
 void wxLogVerbose(const wxString& msg);
 void wxLogStatus(const wxString& msg);
 %name(wxLogStatusFrame)void wxLogStatus(wxFrame *pFrame, const wxString& msg);


@@ -872,6 +906,13 @@ public:
     wxOutputStream *GetOutputStream();
 
     void CloseOutput();
     wxOutputStream *GetOutputStream();
 
     void CloseOutput();

+
+    // return TRUE if the child process stdout is not closed
+    bool IsInputOpened() const;
+
+    // return TRUE if any input is available on the child process stdout/err
+    bool IsInputAvailable() const;
+    bool IsErrorAvailable() const;

 };
 
 
 };
 
 


@@ -1028,6 +1069,8 @@ public:
 
     bool SetCapture(wxWindow* win, int pollingFreq = 0);
     bool ReleaseCapture();
 
     bool SetCapture(wxWindow* win, int pollingFreq = 0);
     bool ReleaseCapture();

+
+    %pragma(python) addtoclass = "def __nonzero__(self): return self.IsOk()"

 };
 
 //----------------------------------------------------------------------
 };
 
 //----------------------------------------------------------------------


@@ -1061,11 +1104,13 @@ public:
 class wxWave : public wxObject
 {
 public:
 class wxWave : public wxObject
 {
 public:

-  wxWave(const wxString& fileName, bool isResource = FALSE);
-  ~wxWave();
+    wxWave(const wxString& fileName, bool isResource = FALSE);
+    ~wxWave();
+
+    bool  IsOk() const;
+    bool  Play(bool async = TRUE, bool looped = FALSE) const;

 
 

-  bool  IsOk() const;
-  bool  Play(bool async = TRUE, bool looped = FALSE) const;
+    %pragma(python) addtoclass = "def __nonzero__(self): return self.IsOk()"

 };
 
 %new wxWave* wxWaveData(const wxString& data);
 };
 
 %new wxWave* wxWaveData(const wxString& data);


@@ -1095,10 +1140,10 @@ class wxFileTypeInfo
 public:
     // ctors
         // a normal item
 public:
     // ctors
         // a normal item

-    wxFileTypeInfo(const char* mimeType,
-                   const char* openCmd,
-                   const char* printCmd,
-                   const char* desc);
+    wxFileTypeInfo(const wxString& mimeType,
+                   const wxString& openCmd,
+                   const wxString& printCmd,
+                   const wxString& desc);

 
 
         // the array elements correspond to the parameters of the ctor above in
 
 
         // the array elements correspond to the parameters of the ctor above in


@@ -1192,7 +1237,7 @@ public:
             wxString str;
             if (self->GetMimeType(&str)) {
 #if wxUSE_UNICODE
             wxString str;
             if (self->GetMimeType(&str)) {
 #if wxUSE_UNICODE

-             return PyUnicode_FromUnicode(str.c_str(), str.Len());
+             return PyUnicode_FromWideChar(str.c_str(), str.Len());

 #else
              return PyString_FromStringAndSize(str.c_str(), str.Len());
 #endif
 #else
              return PyString_FromStringAndSize(str.c_str(), str.Len());
 #endif


@@ -1225,9 +1270,9 @@ public:
     %addmethods {
         // Get the icon corresponding to this file type
         %new wxIcon* GetIcon() {
     %addmethods {
         // Get the icon corresponding to this file type
         %new wxIcon* GetIcon() {

-            wxIcon icon;
-            if (self->GetIcon(&icon))
-                return new wxIcon(icon);
+            wxIconLocation loc;
+            if (self->GetIcon(&loc))
+                return new wxIcon(loc);

             else
                 return NULL;
         }
             else
                 return NULL;
         }


@@ -1235,16 +1280,20 @@ public:
         // Get the icon corresponding to this file type, the name of the file
         // where this icon resides, and its index in this file if applicable.
         PyObject* GetIconInfo() {
         // Get the icon corresponding to this file type, the name of the file
         // where this icon resides, and its index in this file if applicable.
         PyObject* GetIconInfo() {

-            wxIcon icon;
-            wxString iconFile;
-            int iconIndex;
-            if (self->GetIcon(&icon, &iconFile, &iconIndex)) {
+            wxIconLocation loc;
+            if (self->GetIcon(&loc)) {
+                wxString iconFile = loc.GetFileName();
+                int iconIndex     = -1;
+#ifdef __WXMSW__
+                iconIndex = loc.GetIndex();
+#endif
+                // Make a tuple and put the values in it

                 wxPyBeginBlockThreads();
                 PyObject* tuple = PyTuple_New(3);
                 wxPyBeginBlockThreads();
                 PyObject* tuple = PyTuple_New(3);

-                PyTuple_SetItem(tuple, 0, wxPyConstructObject(new wxIcon(icon),
-                                                              "wxIcon", TRUE));
+                PyTuple_SetItem(tuple, 0,
+                                wxPyConstructObject(new wxIcon(loc), wxT("wxIcon"), TRUE));

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-                PyTuple_SetItem(tuple, 1, PyUnicode_FromUnicode(iconFile.c_str(), iconFile.Len()));
+                PyTuple_SetItem(tuple, 1, PyUnicode_FromWideChar(iconFile.c_str(), iconFile.Len()));

 #else
                 PyTuple_SetItem(tuple, 1, PyString_FromStringAndSize(iconFile.c_str(), iconFile.Len()));
 #endif
 #else
                 PyTuple_SetItem(tuple, 1, PyString_FromStringAndSize(iconFile.c_str(), iconFile.Len()));
 #endif


@@ -1263,7 +1312,7 @@ public:
             wxString str;
             if (self->GetDescription(&str)) {
 #if  wxUSE_UNICODE
             wxString str;
             if (self->GetDescription(&str)) {
 #if  wxUSE_UNICODE

-             return PyUnicode_FromUnicode(str.c_str(), str.Len());
+             return PyUnicode_FromWideChar(str.c_str(), str.Len());

 #else
              return PyString_FromStringAndSize(str.c_str(), str.Len());
 #endif
 #else
              return PyString_FromStringAndSize(str.c_str(), str.Len());
 #endif


@@ -1280,7 +1329,7 @@ public:
             wxString str;
             if (self->GetOpenCommand(&str, wxFileType::MessageParameters(filename, mimetype))) {
 #if  wxUSE_UNICODE
             wxString str;
             if (self->GetOpenCommand(&str, wxFileType::MessageParameters(filename, mimetype))) {
 #if  wxUSE_UNICODE

-                return PyUnicode_FromUnicode(str.c_str(), str.Len());
+                return PyUnicode_FromWideChar(str.c_str(), str.Len());

 #else
                 return PyString_FromStringAndSize(str.c_str(), str.Len());
 #endif
 #else
                 return PyString_FromStringAndSize(str.c_str(), str.Len());
 #endif


@@ -1297,7 +1346,7 @@ public:
             wxString str;
             if (self->GetPrintCommand(&str, wxFileType::MessageParameters(filename, mimetype))) {
 #if wxUSE_UNICODE
             wxString str;
             if (self->GetPrintCommand(&str, wxFileType::MessageParameters(filename, mimetype))) {
 #if wxUSE_UNICODE

-                return PyUnicode_FromUnicode(str.c_str(), str.Len());
+                return PyUnicode_FromWideChar(str.c_str(), str.Len());

 #else
                 return PyString_FromStringAndSize(str.c_str(), str.Len());
 #endif
 #else
                 return PyString_FromStringAndSize(str.c_str(), str.Len());
 #endif


@@ -1376,7 +1425,7 @@ public:
     //
     // use the extraDir parameter if you want to look for files in another
     // directory
     //
     // use the extraDir parameter if you want to look for files in another
     // directory

-    void Initialize(int mailcapStyle = wxMAILCAP_STANDARD,
+    void Initialize(int mailcapStyle = wxMAILCAP_ALL,

                     const wxString& extraDir = wxPyEmptyString);
 
     // and this function clears all the data from the manager
                     const wxString& extraDir = wxPyEmptyString);
 
     // and this function clears all the data from the manager


@@ -1444,6 +1493,7 @@ public:
 %{
 #if 0
 %}
 %{
 #if 0
 %}

+// See also wxPy_ReinitStockObjects in helpers.cpp

 extern wxMimeTypesManager* wxTheMimeTypesManager;
 %{
 #endif
 extern wxMimeTypesManager* wxTheMimeTypesManager;
 %{
 #endif


@@ -1500,6 +1550,7 @@ wxART_ERROR                = 'wxART_ERROR'
 wxART_QUESTION             = 'wxART_QUESTION'
 wxART_WARNING              = 'wxART_WARNING'
 wxART_INFORMATION          = 'wxART_INFORMATION'
 wxART_QUESTION             = 'wxART_QUESTION'
 wxART_WARNING              = 'wxART_WARNING'
 wxART_INFORMATION          = 'wxART_INFORMATION'

+wxART_MISSING_IMAGE        = 'wxART_MISSING_IMAGE'

 "
 
 %{  // Python aware wxArtProvider
 "
 
 %{  // Python aware wxArtProvider


@@ -1512,7 +1563,7 @@ public:
         wxBitmap rval = wxNullBitmap;
         wxPyBeginBlockThreads();
         if ((wxPyCBH_findCallback(m_myInst, "CreateBitmap"))) {
         wxBitmap rval = wxNullBitmap;
         wxPyBeginBlockThreads();
         if ((wxPyCBH_findCallback(m_myInst, "CreateBitmap"))) {

-            PyObject* so = wxPyConstructObject((void*)&size, "wxSize", 0);
+            PyObject* so = wxPyConstructObject((void*)&size, wxT("wxSize"), 0);

             PyObject* ro;
             wxBitmap* ptr;
             PyObject* s1, *s2;
             PyObject* ro;
             wxBitmap* ptr;
             PyObject* s1, *s2;


@@ -1567,8 +1618,6 @@ public:
                           const wxString& client = wxPyART_OTHER,
                           const wxSize& size = wxDefaultSize);
 
                           const wxString& client = wxPyART_OTHER,
                           const wxSize& size = wxDefaultSize);
 

-    // Destroy caches & all providers
-    static void CleanUpProviders();

 };
 
 
 };
 
 


@@ -1602,26 +1651,74 @@ public:
     // Accessors
     wxString GetHistoryFile(int i) const;
 
     // Accessors
     wxString GetHistoryFile(int i) const;
 

-    // A synonym for GetNoHistoryFiles

     int GetCount() const;
     int GetCount() const;

-    int GetNoHistoryFiles() const;
+    %pragma(python) addtoclass = "GetNoHistoryFiles = GetCount"

 
 };
 
 //----------------------------------------------------------------------
 
 };
 
 //----------------------------------------------------------------------

+
+class wxEffects: public wxObject
+{
+public:
+    // Assume system colours
+    wxEffects();
+
+    wxColour GetHighlightColour() const;
+    wxColour GetLightShadow() const;
+    wxColour GetFaceColour() const;
+    wxColour GetMediumShadow() const;
+    wxColour GetDarkShadow() const;
+
+    void SetHighlightColour(const wxColour& c);
+    void SetLightShadow(const wxColour& c);
+    void SetFaceColour(const wxColour& c);
+    void SetMediumShadow(const wxColour& c);
+    void SetDarkShadow(const wxColour& c);
+
+    void Set(const wxColour& highlightColour, const wxColour& lightShadow,
+             const wxColour& faceColour, const wxColour& mediumShadow,
+             const wxColour& darkShadow);
+
+    // Draw a sunken edge
+    void DrawSunkenEdge(wxDC& dc, const wxRect& rect, int borderSize = 1);
+
+    // Tile a bitmap
+    bool TileBitmap(const wxRect& rect, wxDC& dc, wxBitmap& bitmap);
+
+};
+

 //----------------------------------------------------------------------
 
 //----------------------------------------------------------------------
 

-// %{
-// #if wxUSE_UNICODE
-// #define ADD_STRING(dict, str) \
-//     wxString tmp##str(str); \
-//     PyDict_SetItemString(dict, #str, \
-//                          PyUnicode_FromUnicode(tmp##str.c_str(), tmp##str.Len()))
-// #else
-// #define ADD_STRING(dict, str) \
-//     PyDict_SetItemString(d, #str, PyString_FromString(str))
-// #endif
-// %}
+class wxSingleInstanceChecker
+{
+public:
+    // like Create() but no error checking (dangerous!)
+    wxSingleInstanceChecker(const wxString& name,
+                            const wxString& path = wxPyEmptyString);
+
+    // default ctor, use Create() after it
+    %name(wxPreSingleInstanceChecker) wxSingleInstanceChecker();
+
+    ~wxSingleInstanceChecker();
+
+
+    // name must be given and be as unique as possible, it is used as the mutex
+    // name under Win32 and the lock file name under Unix -
+    // wxTheApp->GetAppName() may be a good value for this parameter
+    //
+    // path is optional and is ignored under Win32 and used as the directory to
+    // create the lock file in under Unix (default is wxGetHomeDir())
+    //
+    // returns FALSE if initialization failed, it doesn't mean that another
+    // instance is running - use IsAnotherRunning() to check it
+    bool Create(const wxString& name, const wxString& path = wxPyEmptyString);
+
+    // is another copy of this program already running?
+    bool IsAnotherRunning() const;
+};
+
+//----------------------------------------------------------------------

 
 
 %init %{
 
 
 %init %{