SWIGged updates

[wxWidgets.git] / wxPython / src / mac / misc2.cpp

diff --git a/wxPython/src/mac/misc2.cpp b/wxPython/src/mac/misc2.cpp
index 598e68925ac4dd5b7abc1f5e837c752ad3fe940b..9be907ca215fa9aa0ffd87f925b3467ae1df49cb 100644 (file)
--- a/wxPython/src/mac/misc2.cpp
+++ b/wxPython/src/mac/misc2.cpp
@@ -318,15 +318,80 @@ public:
 
 #ifdef __WXMSW__
 #include <wx/msw/private.h>
 
 #ifdef __WXMSW__
 #include <wx/msw/private.h>

+#include <wx/dynload.h>

 #endif
 
 
 #endif
 
 

-void wxDrawWindowOnDC(wxWindow* window, const wxDC& dc)
+void wxDrawWindowOnDC(wxWindow* window, const wxDC& dc, int method)

 {
 #ifdef __WXMSW__
 {
 #ifdef __WXMSW__

-    ::SendMessage(GetHwndOf(window), WM_PAINT, (long)GetHdcOf(dc), 0);
-//     ::SendMessage(GetHwndOf(window), WM_PRINTCLIENT, (long)GetHdcOf(dc),
-//                   PRF_CLIENT | PRF_NONCLIENT | PRF_CHILDREN );
+
+    switch (method)
+    {
+        case 1:
+            // This one only partially works.  Appears to be an undocumented
+            // "standard" convention that not all widgets adhear to.  For
+            // example, for some widgets backgrounds or non-client areas may
+            // not be painted.
+            ::SendMessage(GetHwndOf(window), WM_PAINT, (long)GetHdcOf(dc), 0);
+            break;
+
+        case 2:
+            // This one works much better, except for on XP.  On Win2k nearly
+            // all widgets and their children are captured correctly[**].  On
+            // XP with Themes activated most native widgets draw only
+            // partially, if at all.  Without themes it works just like on
+            // Win2k.
+            //
+            // ** For example the radio buttons in a wxRadioBox are not its
+            // children by default, but you can capture it via the panel
+            // instead, or change RADIOBTN_PARENT_IS_RADIOBOX in radiobox.cpp.
+            ::SendMessage(GetHwndOf(window), WM_PRINT, (long)GetHdcOf(dc),
+                          PRF_CLIENT | PRF_NONCLIENT | PRF_CHILDREN |
+                          PRF_ERASEBKGND | PRF_OWNED );
+            break;
+
+        case 3:
+            // This one is only defined in the latest SDK and is only
+            // available on XP.  MSDN says it is similar to sending WM_PRINT
+            // so I expect that it will work similar to the above.  Since it
+            // is avaialble only on XP, it can't be compiled like this and
+            // will have to be loaded dynamically.
+            // //::PrintWindow(GetHwndOf(window), GetHdcOf(dc), 0); //break;
+
+            // fall through
+
+        case 4:
+            // Use PrintWindow if available, or fallback to WM_PRINT
+            // otherwise.  Unfortunately using PrintWindow is even worse than
+            // 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 PrintWindow_t pfnPrintWindow = NULL;
+            if ( !s_triedToLoad )
+            {
+
+                s_triedToLoad = true;
+                wxDynamicLibrary dllUser32(_T("user32.dll"));
+                if ( dllUser32.IsLoaded() )
+                {
+                    wxLogNull nolog;  // Don't report errors here
+                    pfnPrintWindow = (PrintWindow_t)dllUser32.GetSymbol(_T("PrintWindow"));
+                }
+            }
+            if (pfnPrintWindow)
+            {
+                printf("Using PrintWindow\n");
+                pfnPrintWindow(GetHwndOf(window), GetHdcOf(dc), 0);
+            }
+            else
+            {
+                printf("Using WM_PRINT\n");
+                ::SendMessage(GetHwndOf(window), WM_PRINT, (long)GetHdcOf(dc),
+                              PRF_CLIENT | PRF_NONCLIENT | PRF_CHILDREN | PRF_ERASEBKGND | PRF_OWNED );
+            }
+    }

 #endif
 }
 
 #endif
 }
 


@@ -2303,12 +2368,13 @@ static PyObject *_wrap_wxDrawWindowOnDC(PyObject *self, PyObject *args, PyObject
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxDC * _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxDC * _arg1;

+    int  _arg2;

     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;

-    char *_kwnames[] = { "window","dc", NULL };
+    char *_kwnames[] = { "window","dc","method", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxDrawWindowOnDC",_kwnames,&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOi:wxDrawWindowOnDC",_kwnames,&_argo0,&_argo1,&_arg2)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -2325,7 +2391,7 @@ static PyObject *_wrap_wxDrawWindowOnDC(PyObject *self, PyObject *args, PyObject
     }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
     }
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    wxDrawWindowOnDC(_arg0,*_arg1);
+    wxDrawWindowOnDC(_arg0,*_arg1,_arg2);

 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;