always call SetIcon() on the main frame of the sample; some small cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -68,6 +68,9 @@
|
||||
|
||||
#include <wx/artprov.h>
|
||||
|
||||
#ifndef __WXMSW__
|
||||
#include "../sample.xpm"
|
||||
#endif
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
// wxSampleMultiButtonEditor
|
||||
@@ -2062,6 +2065,8 @@ FormMain::FormMain(const wxString& title, const wxPoint& pos, const wxSize& size
|
||||
(wxMINIMIZE_BOX|wxMAXIMIZE_BOX|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCAPTION|
|
||||
wxTAB_TRAVERSAL|wxCLOSE_BOX|wxNO_FULL_REPAINT_ON_RESIZE) )
|
||||
{
|
||||
SetIcon(wxICON(sample));
|
||||
|
||||
m_propGrid = NULL;
|
||||
m_panel = NULL;
|
||||
|
||||
|
@@ -72,12 +72,12 @@ class wxVectorProperty : public wxPGProperty
|
||||
public:
|
||||
|
||||
wxVectorProperty( const wxString& label = wxPG_LABEL,
|
||||
const wxString& name = wxPG_LABEL,
|
||||
const wxVector3f& value = wxVector3f() );
|
||||
const wxString& name = wxPG_LABEL,
|
||||
const wxVector3f& value = wxVector3f() );
|
||||
virtual ~wxVectorProperty();
|
||||
|
||||
virtual void ChildChanged( wxVariant& thisValue,
|
||||
int childIndex, wxVariant& childValue ) const;
|
||||
int childIndex, wxVariant& childValue ) const;
|
||||
virtual void RefreshChildren();
|
||||
|
||||
protected:
|
||||
@@ -109,7 +109,7 @@ public:
|
||||
virtual ~wxTriangleProperty();
|
||||
|
||||
virtual void ChildChanged( wxVariant& thisValue,
|
||||
int childIndex, wxVariant& childValue ) const;
|
||||
int childIndex, wxVariant& childValue ) const;
|
||||
virtual void RefreshChildren();
|
||||
|
||||
protected:
|
||||
@@ -128,7 +128,7 @@ class FormMain : public wxFrame
|
||||
{
|
||||
public:
|
||||
FormMain(const wxString& title, const wxPoint& pos, const wxSize& size );
|
||||
~FormMain();
|
||||
~FormMain();
|
||||
|
||||
wxPropertyGridManager* m_pPropGridManager;
|
||||
wxPropertyGrid* m_propGrid;
|
||||
|
Reference in New Issue
Block a user