added a test to check how exception handling works with Win32 SEH; corrected copyright

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

diff --git a/wxPython/src/_misc.i b/wxPython/src/_misc.i
index a1f6e305f1ca12599e302298407241c876d3e0e9..15d4c69340cbeac570d0e1acca65d0d21ae82141 100644 (file)
--- a/wxPython/src/_misc.i
+++ b/wxPython/src/_misc.i
@@ -19,6 +19,9 @@
 
 
 #ifndef __WXX11__
 
 
 #ifndef __WXX11__

+
+MustHaveApp(wxToolTip);
+

 class wxToolTip : public wxObject {
 public:
     wxToolTip(const wxString &tip);
 class wxToolTip : public wxObject {
 public:
     wxToolTip(const wxString &tip);


@@ -35,6 +38,8 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

+MustHaveApp(wxCaret);
+

 class wxCaret {
 public:
     wxCaret(wxWindow* window, const wxSize& size);
 class wxCaret {
 public:
     wxCaret(wxWindow* window, const wxSize& size);


@@ -57,11 +62,11 @@ public:
     
 
     wxWindow *GetWindow();
     
 
     wxWindow *GetWindow();

-    %name(MoveXY)void Move(int x, int y);
+    %Rename(MoveXY, void, Move(int x, int y));

     void Move(const wxPoint& pt);
     void Move(const wxPoint& pt);

-    %name(SetSizeWH) void SetSize(int width, int height);
+    %Rename(SetSizeWH,  void, SetSize(int width, int height));

     void SetSize(const wxSize& size);
     void SetSize(const wxSize& size);

-    void Show(int show = True);
+    void Show(int show = true);

     void Hide();
 
     %pythoncode { def __nonzero__(self): return self.IsOk() }
     void Hide();
 
     %pythoncode { def __nonzero__(self): return self.IsOk() }


@@ -79,6 +84,8 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

+MustHaveApp(wxBusyCursor);
+

 class  wxBusyCursor {
 public:
     wxBusyCursor(wxCursor* cursor = wxHOURGLASS_CURSOR);
 class  wxBusyCursor {
 public:
     wxBusyCursor(wxCursor* cursor = wxHOURGLASS_CURSOR);


@@ -87,6 +94,8 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

+MustHaveApp(wxWindowDisabler);
+

 class wxWindowDisabler {
 public:
     wxWindowDisabler(wxWindow *winToSkip = NULL);
 class wxWindowDisabler {
 public:
     wxWindowDisabler(wxWindow *winToSkip = NULL);


@@ -95,6 +104,8 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

+MustHaveApp(wxBusyInfo);
+

 class wxBusyInfo : public wxObject {
 public:
     wxBusyInfo(const wxString& message);
 class wxBusyInfo : public wxObject {
 public:
     wxBusyInfo(const wxString& message);


@@ -132,7 +143,7 @@ public:
 class wxFileHistory : public wxObject
 {
 public:
 class wxFileHistory : public wxObject
 {
 public:

-    wxFileHistory(int maxFiles = 9);
+    wxFileHistory(int maxFiles = 9, wxWindowID idBase = wxID_FILE1);

     ~wxFileHistory();
 
     // Operations
     ~wxFileHistory();
 
     // Operations


@@ -148,7 +159,7 @@ public:
     void Save(wxConfigBase& config);
 
     void AddFilesToMenu();
     void Save(wxConfigBase& config);
 
     void AddFilesToMenu();

-    %name(AddFilesToThisMenu)void AddFilesToMenu(wxMenu* menu);
+    %Rename(AddFilesToThisMenu, void, AddFilesToMenu(wxMenu* menu));

 
     // Accessors
     wxString GetHistoryFile(int i) const;
 
     // Accessors
     wxString GetHistoryFile(int i) const;


@@ -173,7 +184,7 @@ public:
                             const wxString& path = wxPyEmptyString);
 
     // default ctor, use Create() after it
                             const wxString& path = wxPyEmptyString);
 
     // default ctor, use Create() after it

-    %name(PreSingleInstanceChecker) wxSingleInstanceChecker();
+    %RenameCtor(PreSingleInstanceChecker,  wxSingleInstanceChecker());

 
     ~wxSingleInstanceChecker();
 
 
     ~wxSingleInstanceChecker();
 


@@ -253,12 +264,12 @@ void wxDrawWindowOnDC(wxWindow* window, const wxDC& dc, int method)
             // WM_PRINT.  For most native widgets nothing is drawn to the dc
             // at all, with or without Themes.
             typedef BOOL (WINAPI *PrintWindow_t)(HWND, HDC, UINT);
             // WM_PRINT.  For most native widgets nothing is drawn to the dc
             // at all, with or without Themes.
             typedef BOOL (WINAPI *PrintWindow_t)(HWND, HDC, UINT);

-            static bool s_triedToLoad = False;
+            static bool s_triedToLoad = false;

             static PrintWindow_t pfnPrintWindow = NULL;
             if ( !s_triedToLoad )
             {
 
             static PrintWindow_t pfnPrintWindow = NULL;
             if ( !s_triedToLoad )
             {
 

-                s_triedToLoad = True;
+                s_triedToLoad = true;

                 wxDynamicLibrary dllUser32(_T("user32.dll"));
                 if ( dllUser32.IsLoaded() )
                 {
                 wxDynamicLibrary dllUser32(_T("user32.dll"));
                 if ( dllUser32.IsLoaded() )
                 {