Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

port proplist.cpp to wxArtProvider

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-03-22 23:22:02 +00:00
parent 2f3f48883d
commit 00958db524
8 changed files with 12 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
include/wx/generic/cross.xpm → art/cross.xpm
View File

0
include/wx/generic/tick.xpm → art/tick.xpm
View File

2
include/wx/artprov.h
View File

@@ -71,6 +71,8 @@ typedef wxString wxArtID;
#define wxART_GO_DIR_UP _T("go_dir_up")
#define wxART_EXECUTABLE_FILE _T("executable_file")
#define wxART_NORMAL_FILE _T("normal_file")
#define wxART_TICK_MARK _T("tick")
#define wxART_CROSS_MARK _T("cross")
// ----------------------------------------------------------------------------
// wxArtProvider class

BIN
include/wx/msw/cross.bmp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 198 B

BIN
include/wx/msw/tick.bmp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 198 B

12
include/wx/msw/wx.rc
View File

@@ -83,14 +83,6 @@ WXCURSOR_RIGHT_ARROW CURSOR DISCARDABLE "wx/msw/rightarr.cur"
//wxDEFAULT_MDIPARENTFRAME ICON "wx/msw/mdi.ico"
//wxDEFAULT_MDICHILDFRAME ICON "wx/msw/child.ico"
// Standard large icons
/* we don't use these files any more, use Windows standard icons instead
wxICON_QUESTION ICON "wx/msw/question.ico"
wxICON_WARNING ICON "wx/msw/warning.ico"
wxICON_ERROR ICON "wx/msw/error.ico"
wxICON_INFO ICON "wx/msw/info.ico"
*/
// Standard small icons
wxICON_SMALL_CLOSED_FOLDER ICON "wx/msw/folder1.ico"
wxICON_SMALL_OPEN_FOLDER ICON "wx/msw/folder2.ico"
@@ -113,10 +105,6 @@ wxDISABLE_BUTTON_BITMAP BITMAP "wx/msw/disable.bmp"
#endif
// For src/generic/proplist.cpp
tick_bmp BITMAP "wx/msw/tick.bmp"
cross_bmp BITMAP "wx/msw/cross.bmp"
// For wxContextHelpButton
csquery BITMAP "wx/msw/csquery.bmp"

4
src/common/artstd.cpp
View File

@@ -92,6 +92,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxDefaultArtProviderModule, wxModule)
#include "../../art/dir_up.xpm"
#include "../../art/exefile.xpm"
#include "../../art/deffile.xpm"
#include "../../art/tick.xpm"
#include "../../art/cross.xpm"
#undef static
@@ -129,6 +131,8 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
ART(wxART_GO_DIR_UP, dir_up)
ART(wxART_EXECUTABLE_FILE, exefile)
ART(wxART_NORMAL_FILE, deffile)
ART(wxART_TICK_MARK, tick)
ART(wxART_CROSS_MARK, cross)
return wxNullBitmap;
}

74
src/generic/proplist.cpp
View File

@@ -45,6 +45,7 @@
#include "wx/sizer.h"
#include "wx/module.h"
#include "wx/intl.h"
#include "wx/artprov.h"
#include "wx/colordlg.h"
#include "wx/proplist.h"
@@ -54,27 +55,6 @@
#include <math.h>
#include <string.h>
// ----------------------------------------------------------------------------
// XPMs
// ----------------------------------------------------------------------------
// XPM hack: make the arrays const
#define static static const
#ifndef __WXMSW__
#include "wx/generic/cross.xpm"
#include "wx/generic/tick.xpm"
#endif
#undef static
// ----------------------------------------------------------------------------
// accessor functions for the bitmaps (may return NULL, check for it!)
// ----------------------------------------------------------------------------
static wxBitmap *GetTickBitmap();
static wxBitmap *GetCrossBitmap();
// ----------------------------------------------------------------------------
// Property text edit control
// ----------------------------------------------------------------------------
@@ -460,13 +440,13 @@ bool wxPropertyListView::CreateControls()
if (m_buttonFlags & wxPROP_BUTTON_CHECK_CROSS)
{
wxBitmap *tickBitmap = GetTickBitmap();
wxBitmap *crossBitmap = GetCrossBitmap();
wxBitmap tickBitmap = wxArtProvider::GetBitmap(wxART_TICK_MARK);
wxBitmap crossBitmap = wxArtProvider::GetBitmap(wxART_CROSS_MARK);
if ( tickBitmap && crossBitmap )
if ( tickBitmap.Ok() && crossBitmap.Ok() )
{
m_confirmButton = new wxBitmapButton(panel, wxID_PROP_CHECK, *tickBitmap, wxPoint(-1, -1), smallButtonSize );
m_cancelButton = new wxBitmapButton(panel, wxID_PROP_CROSS, *crossBitmap, wxPoint(-1, -1), smallButtonSize );
m_confirmButton = new wxBitmapButton(panel, wxID_PROP_CHECK, tickBitmap, wxPoint(-1, -1), smallButtonSize );
m_cancelButton = new wxBitmapButton(panel, wxID_PROP_CROSS, crossBitmap, wxPoint(-1, -1), smallButtonSize );
}
else
{
@@ -1846,47 +1826,5 @@ void wxPropertyStringListEditorDialog::ShowCurrentSelection()
m_stringText->Enable(TRUE);
}
// ----------------------------------------------------------------------------
// global functions
// ----------------------------------------------------------------------------
// FIXME MT-UNSAFE
static wxBitmap *GetTickBitmap()
{
static wxBitmap* s_tickBitmap = (wxBitmap *) NULL;
static bool s_loaded = FALSE;
if ( !s_loaded )
{
s_loaded = TRUE; // set it to TRUE anyhow, we won't try again
#if defined(__WXMSW__) || defined(__WXPM__)
s_tickBitmap = new wxBitmap(_T("tick_bmp"), wxBITMAP_TYPE_RESOURCE);
#else
s_tickBitmap = new wxBitmap( tick_xpm );
#endif
}
return s_tickBitmap;
}
static wxBitmap *GetCrossBitmap()
{
static wxBitmap* s_crossBitmap = (wxBitmap *) NULL;
static bool s_loaded = FALSE;
if ( !s_loaded )
{
s_loaded = TRUE; // set it to TRUE anyhow, we won't try again
#if defined(__WXMSW__) || defined(__WXPM__)
s_crossBitmap = new wxBitmap(_T("cross_bmp"), wxBITMAP_TYPE_RESOURCE);
#else // XPMs
s_crossBitmap = new wxBitmap( cross_xpm );
#endif // BMPs/XPMs
}
return s_crossBitmap;
}
#endif // wxUSE_PROPSHEET