Remove USE_GDIPLUS setting from bakefiles.

[wxWidgets.git] / utils / screenshotgen / src / autocapture.cpp

diff --git a/utils/screenshotgen/src/autocapture.cpp b/utils/screenshotgen/src/autocapture.cpp
index 35491582248e260ec2b6df4295dc5c1045f17c5c..c425010e54d714e7db6e5a25e0424c0e8ed9de33 100644 (file)
--- a/utils/screenshotgen/src/autocapture.cpp
+++ b/utils/screenshotgen/src/autocapture.cpp
@@ -44,7 +44,7 @@ AutoCaptureMechanism::AutoCaptureMechanism(wxNotebook *notebook,
 }
 
 /* static */
 }
 
 /* static */

-wxString AutoCaptureMechanism::default_dir = _T("screenshots");
+wxString AutoCaptureMechanism::default_dir = wxT("screenshots");

 
 /* static */
 wxString AutoCaptureMechanism::GetDefaultDirectoryAbsPath()
 
 /* static */
 wxString AutoCaptureMechanism::GetDefaultDirectoryAbsPath()


@@ -61,7 +61,7 @@ void AutoCaptureMechanism::Delay(int seconds)
 
     // Wait for 3 seconds
     clock_t start = clock();
 
     // Wait for 3 seconds
     clock_t start = clock();

-    while (clock() - start < CLOCKS_PER_SEC * seconds)
+    while ( clock() - start < (clock_t)CLOCKS_PER_SEC * seconds)

         wxYieldIfNeeded();
 }
 
         wxYieldIfNeeded();
 }
 


@@ -72,7 +72,7 @@ bool AutoCaptureMechanism::Capture(wxBitmap* bitmap, int x, int y,
     // Somehow wxScreenDC.Blit() doesn't work under Mac for now. Here is a trick.
 #ifdef __WXMAC__
 
     // Somehow wxScreenDC.Blit() doesn't work under Mac for now. Here is a trick.
 #ifdef __WXMAC__
 

-    // wxExecute(_T("screencapture -x ") + tempfile, wxEXEC_SYNC);
+    // wxExecute(wxT("screencapture -x ") + tempfile, wxEXEC_SYNC);

 
     char captureCommand[80] =""; // a reasonable max size is 80
     sprintf(captureCommand, "sleep %d;%s", delay, "screencapture -x /tmp/wx_screen_capture.png");
 
     char captureCommand[80] =""; // a reasonable max size is 80
     sprintf(captureCommand, "sleep %d;%s", delay, "screencapture -x /tmp/wx_screen_capture.png");


@@ -83,11 +83,11 @@ bool AutoCaptureMechanism::Capture(wxBitmap* bitmap, int x, int y,
     wxBitmap fullscreen;
     do
     {
     wxBitmap fullscreen;
     do
     {

-        fullscreen = wxBitmap(_T("/tmp/wx_screen_capture.png"), wxBITMAP_TYPE_PNG);
+        fullscreen = wxBitmap(wxT("/tmp/wx_screen_capture.png"), wxBITMAP_TYPE_PNG);

     }
     while(!fullscreen.IsOk());
 
     }
     while(!fullscreen.IsOk());
 

-    bitmap = fullscreen.GetSubBitmap(wxRect(x,y,width,height));
+    *bitmap = fullscreen.GetSubBitmap(wxRect(x, y, width, height));

 
     // to prevent loading the old screenshot next time
     system("rm /tmp/wx_screen_capture.png");
 
     // to prevent loading the old screenshot next time
     system("rm /tmp/wx_screen_capture.png");


@@ -171,7 +171,7 @@ void AutoCaptureMechanism::CaptureAll()
         }
 
         // create the screenshot
         }
 
         // create the screenshot

-        wxBitmap screenshot(0, 0);
+        wxBitmap screenshot(1, 1);

         Capture(&screenshot, ctrl);
 
         if(ctrl.flag & AJ_Union)
         Capture(&screenshot, ctrl);
 
         if(ctrl.flag & AJ_Union)


@@ -181,9 +181,9 @@ void AutoCaptureMechanism::CaptureAll()
             {
                 ++it;
                 it->name = ctrl.name; //preserving the name
             {
                 ++it;
                 it->name = ctrl.name; //preserving the name

-                wxBitmap screenshot2(0, 0);
+                wxBitmap screenshot2(1, 1);

                 Capture(&screenshot2, *it);
                 Capture(&screenshot2, *it);

-                wxBitmap combined(0, 0);
+                wxBitmap combined(1, 1);

                 Union(&screenshot, &screenshot2, &combined);
                 screenshot = combined;
             }
                 Union(&screenshot, &screenshot2, &combined);
                 screenshot = combined;
             }


@@ -199,7 +199,7 @@ bool AutoCaptureMechanism::Capture(wxBitmap* bitmap, Control& ctrl)
 {
     // no manual specification for the control name
     // or name adjustment is disabled globally
 {
     // no manual specification for the control name
     // or name adjustment is disabled globally

-    if (ctrl.name == _T("") || m_flag & AJ_DisableNameAdjust)
+    if (ctrl.name == wxT("") || m_flag & AJ_DisableNameAdjust)

     {
         // Get its name from wxRTTI
         ctrl.name = ctrl.ctrl->GetClassInfo()->GetClassName();
     {
         // Get its name from wxRTTI
         ctrl.name = ctrl.ctrl->GetClassInfo()->GetClassName();


@@ -234,7 +234,7 @@ bool AutoCaptureMechanism::Capture(wxBitmap* bitmap, Control& ctrl)
 
     // cut off "wx" and change the name into lowercase.
     // e.g. wxButton will have a name of "button" at the end
 
     // cut off "wx" and change the name into lowercase.
     // e.g. wxButton will have a name of "button" at the end

-    ctrl.name.StartsWith(_T("wx"), &(ctrl.name));
+    ctrl.name.StartsWith(wxT("wx"), &(ctrl.name));

     ctrl.name.MakeLower();
 
     // take the screenshot
     ctrl.name.MakeLower();
 
     // take the screenshot


@@ -307,16 +307,16 @@ wxRect AutoCaptureMechanism::GetRect(wxWindow* ctrl, int flag)
         wxStaticText* l[4];
 
         for (int i = 0; i < 4; ++i)
         wxStaticText* l[4];
 
         for (int i = 0; i < 4; ++i)

-            l[i] = new wxStaticText(parent, wxID_ANY, _T(" "));
+            l[i] = new wxStaticText(parent, wxID_ANY, wxT(" "));

 
         m_grid->Add(l[0]);
 
         m_grid->Add(l[0]);

-        m_grid->Add(new wxStaticText(parent, wxID_ANY, _T(" ")));
+        m_grid->Add(new wxStaticText(parent, wxID_ANY, wxT(" ")));

         m_grid->Add(l[1]);
         m_grid->Add(l[1]);

-        m_grid->Add(new wxStaticText(parent, wxID_ANY, _T(" ")));
+        m_grid->Add(new wxStaticText(parent, wxID_ANY, wxT(" ")));

         m_grid->Add(ctrl, 1, wxEXPAND);
         m_grid->Add(ctrl, 1, wxEXPAND);

-        m_grid->Add(new wxStaticText(parent, wxID_ANY, _T(" ")));
+        m_grid->Add(new wxStaticText(parent, wxID_ANY, wxT(" ")));

         m_grid->Add(l[2]);
         m_grid->Add(l[2]);

-        m_grid->Add(new wxStaticText(parent, wxID_ANY, _T(" ")));
+        m_grid->Add(new wxStaticText(parent, wxID_ANY, wxT(" ")));

         m_grid->Add(l[3]);
 
         sizer->Add(m_grid);
         m_grid->Add(l[3]);
 
         sizer->Add(m_grid);