Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-21 05:15:41 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Removed traces of wxFormBuilder from the screenshotgen utility, cleaned up some dependencies in headers, and replaced a few sparse tabs with spaces.

Browse Source 
Also applied patch #10083 (VC6 build fixes for screenshotgen).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2008-10-15 18:49:22 +00:00
parent d1b80f2196
commit f978831f37
11 changed files with 602 additions and 3623 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils/screenshotgen/src/autocapture.cpp
+6 -6
View File
@@ -10,15 +10,16 @@
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
// for all others, include the necessary headers
// for all others, include the necessary headers wxWidgets headers)
#ifndef WX_PRECOMP
#include "wx/wx.h"
#include "wx/wx.h"
#endif
#include <wx/filename.h>
#include "wx/filename.h"
#include "autocapture.h"
#ifdef __WXMAC__
@@ -33,8 +34,7 @@
/* static */
void AutoCaptureMechanism::Delay(int seconds)
{
using std::clock;
using std::clock_t;
// TODO: Switch this to use wxTimer.
// Wait for 3 seconds
clock_t start = clock();
utils/screenshotgen/src/autocapture.h
+5 -5
View File
@@ -6,14 +6,14 @@
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef AUTOCAP_H
#define AUTOCAP_H
#ifndef _AUTOCAPTURE_H_
#define _AUTOCAPTURE_H_
#include <wx/notebook.h>
#include <wx/settings.h>
#include <vector>
#include <ctime>
#include <wx/notebook.h>
// TODO: document what these flags mean
enum AdjustFlags
@@ -112,6 +112,6 @@ private: // internal utils
int m_border;
};
#endif // AUTOCAP_H
#endif // _AUTOCAPTURE_H_
utils/screenshotgen/src/ctrlmaskout.cpp
+15 -17
View File
@@ -10,24 +10,25 @@
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
// for all others, include the necessary headers
// for all others, include the necessary headers wxWidgets headers)
#ifndef WX_PRECOMP
#include "wx/wx.h"
#include "wx/wx.h"
#endif
#ifdef __WXMAC__ // See CreateMask()
#include <wx/minifram.h>
#include <cstdlib>
#endif
#include <wx/filename.h>
#include <wx/hashset.h>
#include "ctrlmaskout.h"
#ifdef __WXMAC__ // See CreateMask()
#include <wx/minifram.h>
#include <cstdlib>
#endif
// use a set to make sure the same control won't be inserted twice
#include "wx/hashset.h"
WX_DECLARE_HASH_SET(wxWindow*, wxPointerHash, wxPointerEqual, CtrlSet);
// It's copied from src/aui/framemanager.cpp and modified, a failed attempt to
// visualize the process of taking the screenshot when wxTopLevelWindow::CanSetTransparent
@@ -75,11 +76,11 @@ public:
// return;
// }
//
// Show(false);
// Show(false);
//
// GetParent()->Update();
// GetParent()->Update();
//
// Show(true);
// Show(true);
//
//
// m_lastWidth = event.GetSize().GetWidth();
@@ -280,9 +281,6 @@ void CtrlMaskOut::DetermineCtrlNameAndRect()
wxString ctrlName;
wxRect ctrlSize;
// use a set to make sure the same control won't be inserted twice
WX_DECLARE_HASH_SET(wxWindow*, wxPointerHash, wxPointerEqual, CtrlSet);
CtrlSet ctrls;
int i, j;
utils/screenshotgen/src/ctrlmaskout.h
+4 -4
View File
@@ -6,10 +6,10 @@
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef WX_CTRL_MASK_OUT
#define WX_CTRL_MASK_OUT
#ifndef _CTRLMASKOUT_H_
#define _CTRLMASKOUT_H_
#include <wx/frame.h>
#include "wx/filename.h"
// ----------------------------------------------------------------------------
@@ -60,6 +60,6 @@ private:
bool m_isTiming;
};
#endif // WX_CTRL_MASK_OUT
#endif // _CTRLMASKOUT_H_
utils/screenshotgen/src/guidesign.fbp
-2963
View File
File diff suppressed because it is too large Load Diff
utils/screenshotgen/src/guiframe.cpp
+427 -430
View File
File diff suppressed because it is too large Load Diff
utils/screenshotgen/src/guiframe.h
+111 -149
View File
@@ -1,160 +1,122 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Apr 16 2008)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// Name: guiframe.h
// Purpose: Defines the window containing all controls.
// Author: Utensil Candel (UtensilCandel@@gmail.com)
// RCS-ID: $Id$
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef __guiframe__
#define __guiframe__
#ifndef _GUIFRAME_H_
#define _GUIFRAME_H_
#include <wx/intl.h>
#include <wx/string.h>
#include <wx/bitmap.h>
#include <wx/image.h>
#include <wx/icon.h>
#include <wx/menu.h>
#include <wx/gdicmn.h>
#include <wx/font.h>
#include <wx/colour.h>
#include <wx/settings.h>
#include <wx/button.h>
#include <wx/stattext.h>
#include <wx/checkbox.h>
#include <wx/radiobut.h>
#include <wx/bmpbuttn.h>
#include <wx/statbmp.h>
#include <wx/gauge.h>
#include <wx/slider.h>
#include <wx/tglbtn.h>
#include <wx/hyperlink.h>
#include <wx/spinctrl.h>
#include <wx/spinbutt.h>
#include <wx/scrolbar.h>
#include <wx/sizer.h>
#include <wx/panel.h>
#include <wx/checklst.h>
#include <wx/listbox.h>
#include <wx/radiobox.h>
#include <wx/statbox.h>
#include <wx/treectrl.h>
#include <wx/listctrl.h>
#include "wx/animate.h"
#include "wx/bmpcbox.h"
#include "wx/calctrl.h"
#include "wx/clrpicker.h"
#include "wx/collpane.h"
#include <wx/textctrl.h>
#include <wx/richtext/richtextctrl.h>
#include <wx/clrpicker.h>
#include <wx/fontpicker.h>
#include <wx/filepicker.h>
#include <wx/calctrl.h>
#include <wx/datectrl.h>
#include <wx/dateevt.h>
#include <wx/dirctrl.h>
#include <wx/choice.h>
#include <wx/combobox.h>
#include <wx/bmpcbox.h>
#include "wx/datectrl.h"
#include "wx/dirctrl.h"
#include "wx/filepicker.h"
#include "wx/fontpicker.h"
#include "wx/hyperlink.h"
#include "wx/listctrl.h"
#include "wx/notebook.h"
#include "wx/richtext/richtextctrl.h"
#include "wx/spinbutt.h"
#include "wx/spinctrl.h"
#include "wx/tglbtn.h"
#include "wx/treectrl.h"
#include "customcombo.h"
#include <wx/notebook.h>
#include <wx/statusbr.h>
#include <wx/frame.h>
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
/// Class GUIFrame
///////////////////////////////////////////////////////////////////////////////
class GUIFrame : public wxFrame
{
private:
protected:
enum
{
idMenuCapFullScreen = 1000,
idMenuCapRect,
idMenuEndCapRect,
idMenuCapAll,
};
wxMenuBar* mbar;
wxMenu* fileMenu;
wxMenu* captureMenu;
wxMenuItem* m_menuCapRect;
wxMenuItem* m_menuEndCapRect;
wxMenu* helpMenu;
wxNotebook* m_notebook1;
wxPanel* m_panel1;
wxButton* m_button1;
wxStaticText* m_staticText1;
wxCheckBox* m_checkBox1;
wxCheckBox* m_checkBox2;
wxRadioButton* m_radioBtn1;
wxRadioButton* m_radioBtn2;
wxBitmapButton* m_bpButton1;
wxStaticBitmap* m_bitmap1;
wxGauge* m_gauge1;
wxSlider* m_slider1;
wxToggleButton* m_toggleBtn1;
wxToggleButton* m_toggleBtn2;
wxHyperlinkCtrl* m_hyperlink1;
wxSpinCtrl* m_spinCtrl1;
wxSpinButton* m_spinBtn1;
wxScrollBar* m_scrollBar1;
wxPanel* m_panel2;
wxCheckListBox* m_checkList1;
wxListBox* m_listBox1;
wxRadioBox* m_radioBox1;
wxStaticBox * m_staticBox1;
wxTreeCtrl* m_treeCtrl1;
wxListCtrl* m_listCtrl1;
wxAnimationCtrl * m_animationCtrl1;
wxCollapsiblePane *m_collPane1;
wxCollapsiblePane *m_collPane2;
wxPanel* m_panel3;
wxTextCtrl* m_textCtrl1;
wxTextCtrl* m_textCtrl2;
wxRichTextCtrl* m_richText1;
wxPanel* m_panel4;
wxColourPickerCtrl* m_colourPicker1;
wxFontPickerCtrl* m_fontPicker1;
wxFilePickerCtrl* m_filePicker1;
wxCalendarCtrl* m_calendar1;
wxDatePickerCtrl* m_datePicker1;
wxGenericDirCtrl* m_genericDirCtrl1;
wxDirPickerCtrl* m_dirPicker1;
wxPanel* m_panel5;
wxChoice* m_choice1;
wxComboBox* m_comboBox1;
wxBitmapComboBox * m_bmpComboBox1;
PenStyleComboBox * m_ownerDrawnComboBox1;
wxComboCtrl * m_comboCtrl1;
wxComboCtrl * m_comboCtrl2;
wxStatusBar* statusBar;
// Virtual event handlers, overide them in your derived class
virtual void OnClose( wxCloseEvent& event ){ event.Skip(); }
virtual void OnSeeScreenshots( wxCommandEvent& event ){ event.Skip(); }
virtual void OnQuit( wxCommandEvent& event ){ event.Skip(); }
virtual void OnCaptureFullScreen( wxCommandEvent& event ){ event.Skip(); }
virtual void OnCaptureRect( wxCommandEvent& event ){ event.Skip(); }
virtual void OnEndCaptureRect( wxCommandEvent& event ){ event.Skip(); }
virtual void OnCaptureAllControls( wxCommandEvent& event ){ event.Skip(); }
virtual void OnAbout( wxCommandEvent& event ){ event.Skip(); }
virtual void OnNotebookPageChanged( wxNotebookEvent& event ){ event.Skip(); }
virtual void OnNotebookPageChanging( wxNotebookEvent& event ){ event.Skip(); }
public:
GUIFrame( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("wxWidgets Control Screenshot Generator"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
~GUIFrame();
public:
GUIFrame( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("wxWidgets Control Screenshot Generator"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
~GUIFrame();
protected:
enum
{
idMenuCapFullScreen = 1000,
idMenuCapRect,
idMenuEndCapRect,
idMenuCapAll,
};
wxMenuBar* mbar;
wxMenu* fileMenu;
wxMenu* captureMenu;
wxMenuItem* m_menuCapRect;
wxMenuItem* m_menuEndCapRect;
wxMenu* helpMenu;
wxNotebook* m_notebook1;
wxPanel* m_panel1;
wxButton* m_button1;
wxStaticText* m_staticText1;
wxCheckBox* m_checkBox1;
wxCheckBox* m_checkBox2;
wxRadioButton* m_radioBtn1;
wxRadioButton* m_radioBtn2;
wxBitmapButton* m_bpButton1;
wxStaticBitmap* m_bitmap1;
wxGauge* m_gauge1;
wxSlider* m_slider1;
wxToggleButton* m_toggleBtn1;
wxToggleButton* m_toggleBtn2;
wxHyperlinkCtrl* m_hyperlink1;
wxSpinCtrl* m_spinCtrl1;
wxSpinButton* m_spinBtn1;
wxScrollBar* m_scrollBar1;
wxPanel* m_panel2;
wxCheckListBox* m_checkList1;
wxListBox* m_listBox1;
wxRadioBox* m_radioBox1;
wxStaticBox * m_staticBox1;
wxTreeCtrl* m_treeCtrl1;
wxListCtrl* m_listCtrl1;
wxAnimationCtrl * m_animationCtrl1;
wxCollapsiblePane *m_collPane1;
wxCollapsiblePane *m_collPane2;
wxPanel* m_panel3;
wxTextCtrl* m_textCtrl1;
wxTextCtrl* m_textCtrl2;
wxRichTextCtrl* m_richText1;
wxPanel* m_panel4;
wxColourPickerCtrl* m_colourPicker1;
wxFontPickerCtrl* m_fontPicker1;
wxFilePickerCtrl* m_filePicker1;
wxCalendarCtrl* m_calendar1;
wxDatePickerCtrl* m_datePicker1;
wxGenericDirCtrl* m_genericDirCtrl1;
wxDirPickerCtrl* m_dirPicker1;
wxPanel* m_panel5;
wxChoice* m_choice1;
wxComboBox* m_comboBox1;
wxBitmapComboBox * m_bmpComboBox1;
PenStyleComboBox * m_ownerDrawnComboBox1;
wxComboCtrl * m_comboCtrl1;
wxComboCtrl * m_comboCtrl2;
wxStatusBar* statusBar;
// Virtual event handlers, overide them in your derived class
virtual void OnClose( wxCloseEvent& event ){ event.Skip(); }
virtual void OnSeeScreenshots( wxCommandEvent& event ){ event.Skip(); }
virtual void OnQuit( wxCommandEvent& event ){ event.Skip(); }
virtual void OnCaptureFullScreen( wxCommandEvent& event ){ event.Skip(); }
virtual void OnCaptureRect( wxCommandEvent& event ){ event.Skip(); }
virtual void OnEndCaptureRect( wxCommandEvent& event ){ event.Skip(); }
virtual void OnCaptureAllControls( wxCommandEvent& event ){ event.Skip(); }
virtual void OnAbout( wxCommandEvent& event ){ event.Skip(); }
virtual void OnNotebookPageChanged( wxNotebookEvent& event ){ event.Skip(); }
virtual void OnNotebookPageChanging( wxNotebookEvent& event ){ event.Skip(); }
};
#endif //__guiframe__
#endif //_GUIFRAME_H_
utils/screenshotgen/src/screenshot_app.cpp
+4 -4
View File
@@ -10,15 +10,15 @@
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
// for all others, include the necessary headers
// for all others, include the necessary headers wxWidgets headers)
#ifndef WX_PRECOMP
#include "wx/wx.h"
#include "wx/wx.h"
#endif
#include <wx/richtext/richtextxml.h>
#include "wx/richtext/richtextxml.h"
#include "screenshot_app.h"
#include "screenshot_main.h"
utils/screenshotgen/src/screenshot_app.h
+4 -4
View File
@@ -6,10 +6,10 @@
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef WXSCREENSHOTAPP_H
#define WXSCREENSHOTAPP_H
#ifndef _SCREENSHOT_APP_H_
#define _SCREENSHOT_APP_H_
#include <wx/app.h>
#include "wx/app.h"
class ScreenshotApp : public wxApp
{
@@ -17,4 +17,4 @@ public:
virtual bool OnInit();
};
#endif // WXSCREENSHOTAPP_H
#endif // _SCREENSHOT_APP_H_
utils/screenshotgen/src/screenshot_main.cpp
+21 -36
View File
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////
// Name: screenshot_main.cpp
// Purpose: Implement the Application Frame
// Purpose: Implements the window containing all controls.
// Author: Utensil Candel (UtensilCandel@@gmail.com)
// RCS-ID: $Id$
// Licence: wxWindows license
@@ -10,25 +10,17 @@
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
// for all others, include the necessary headers
// for all others, include the necessary headers wxWidgets headers)
#ifndef WX_PRECOMP
#include <wx/filename.h>
#include <wx/dcbuffer.h>
#include <wx/colordlg.h>
#include <wx/fontdlg.h>
#include <wx/filedlg.h>
#include <wx/dirdlg.h>
#include "wx/wx.h"
#endif
#include <wx/dir.h>
#include <wx/aboutdlg.h>
#include <wx/msgdlg.h>
#include <wx/dcscreen.h>
#include <wx/filesys.h>
#include <wx/utils.h>
#include "wx/aboutdlg.h"
#include "wx/dir.h"
#include "wx/filesys.h"
#include "screenshot_main.h"
#include "ctrlmaskout.h"
@@ -74,13 +66,7 @@ ScreenshotFrame::~ScreenshotFrame()
}
/*
Do some further customization on some controls generated by wxFormBuilder.
wxFormBuilder does not allow customizations on some controls;
e.g. you cannot load a richtext file in a wxRichtextCtrl during initialization.
Those customizations will be done here.
Do some further customization on some controls.
NB: under wxGTK for the radio button "unchecked" to be unchecked, it's
important to put the wxRB_GROUP style on the first wxRadioButton
@@ -88,7 +74,6 @@ ScreenshotFrame::~ScreenshotFrame()
*/
void ScreenshotFrame::InitFBControls()
{
// For some reason, wxFormBuilder does not set the scrollbar range
m_scrollBar1->SetScrollbar(50, 1, 100, 1);
// Do the default selection for wxComboBox
@@ -107,24 +92,24 @@ void ScreenshotFrame::InitFBControls()
m_treeCtrl1->ExpandAll();
// Add items into wxListCtrl
m_listCtrl1->InsertColumn(0, "Names");
m_listCtrl1->InsertColumn(1, "Values");
for(long index = 0; index < 5; index++) {
m_listCtrl1->InsertColumn(0, "Names");
m_listCtrl1->InsertColumn(1, "Values");
for(long index = 0; index < 5; index++) {
m_listCtrl1->InsertItem( index, wxString::Format(_("Item%d"),index));
m_listCtrl1->SetItem(index, 1, wxString::Format("%d", index));
}
m_listCtrl1->SetItem(index, 1, wxString::Format("%d", index));
}
// Init file and dir pickers
wxString file, dir;
// Init file and dir pickers
wxString file, dir;
#if defined(__WXMSW__)
file = "C:\\Windows\\explorer.exe";
dir = "C:\\Windows";
file = "C:\\Windows\\explorer.exe";
dir = "C:\\Windows";
#else
file = "/bin/bash";
dir = "/home";
file = "/bin/bash";
dir = "/home";
#endif
m_filePicker1->SetPath(file);
m_dirPicker1->SetPath(dir);
m_filePicker1->SetPath(file);
m_dirPicker1->SetPath(dir);
// Check the first item in wxCheckListBox
m_checkList1->Check(0);
utils/screenshotgen/src/screenshot_main.h
+5 -5
View File
@@ -6,8 +6,8 @@
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef WXSCREENSHOTMAIN_H
#define WXSCREENSHOTMAIN_H
#ifndef _SCREENSHOT_MAIN_H_
#define _SCREENSHOT_MAIN_H_
#include "guiframe.h"
@@ -20,9 +20,9 @@ class CtrlMaskOut;
class ScreenshotFrame
#if SCREENSHOTGEN_USE_AUI
: public AuiGUIFrame
: public AuiGUIFrame
#else
: public GUIFrame
: public GUIFrame
#endif
{
public:
@@ -58,4 +58,4 @@ private:
CtrlMaskOut * m_maskout;
};
#endif // WXSCREENSHOTMAIN_H
#endif // _SCREENSHOT_MAIN_H_