Here are the diffs that allow the .zip to contain all the .png files.
Thank you dmoore
ThreadSearch.cpp
c:\Usr\Proj\ThreadSearch>C:\Usr\bin\GnuWin32\bin\diff.exe -u --strip-trailing-cr E:\User\Downloads\_Pending\cbPlugins\temp\ThreadSearch\ThreadSearch.cpp ThreadSearch.cpp
--- E:\User\Downloads\_Pending\cbPlugins\temp\ThreadSearch\ThreadSearch.cpp 2007-06-28 21:12:28.000000000 -0500
+++ ThreadSearch.cpp 2007-06-29 18:08:03.953125000 -0500
@@ -250,8 +250,7 @@
{
// set log image
wxBitmap bmp;
- wxString prefix = ConfigManager::GetDataFolder() + _T("/images/16x16/");
- bmp = cbLoadBitmap(prefix + _T("filefind.png"), wxBITMAP_TYPE_PNG);
+ bmp = wxXmlResource::Get()->LoadBitmap(_T("findf"));
m_ThreadSearchId = pMsgMan->AddLog(m_pThreadSearchView, _T("Thread search"), bmp);
}
@@ -501,13 +500,12 @@
m_pToolbar = toolBar;
m_pThreadSearchView->SetToolBar(toolBar);
- wxString prefix = ConfigManager::GetDataFolder() + _T("/images/16x16/");
wxComboBox* pCboSearchExpr = new wxComboBox (toolBar, idCboSearchExpr, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN);
- wxBitmapButton* pBtnSearch = new wxBitmapButton(toolBar, idBtnSearch, wxBitmap(prefix + wxT("findf.png"), wxBITMAP_TYPE_PNG));
- wxBitmapButton* pBtnOptions = new wxBitmapButton(toolBar, idBtnOptions, wxBitmap(prefix + wxT("options.png"), wxBITMAP_TYPE_PNG));
+ wxBitmapButton* pBtnSearch = new wxBitmapButton(toolBar, idBtnSearch, wxXmlResource::Get()->LoadBitmap(_T("findf")));
+ wxBitmapButton* pBtnOptions = new wxBitmapButton(toolBar, idBtnOptions, wxXmlResource::Get()->LoadBitmap(_T("options")));
- pBtnSearch->SetBitmapDisabled(wxBitmap(prefix + wxT("findfdisabled.png"), wxBITMAP_TYPE_PNG));
- pBtnOptions->SetBitmapDisabled(wxBitmap(prefix + wxT("optionsdisabled.png"), wxBITMAP_TYPE_PNG));
+ pBtnSearch->SetBitmapDisabled(wxXmlResource::Get()->LoadBitmap(_T("findfdisabled")));
+ pBtnOptions->SetBitmapDisabled(wxXmlResource::Get()->LoadBitmap(_T("optionsdisabled")));
toolBar->AddControl(pCboSearchExpr);
toolBar->AddControl(pBtnSearch);
ThreadSearchView.cpp
c:\Usr\Proj\ThreadSearch>C:\Usr\bin\GnuWin32\bin\diff.exe -u --strip-trailing-cr E:\User\Downloads\_Pending\cbPlugins\temp\ThreadSearch\ThreadSearchView.cpp ThreadSearchView.cpp
--- E:\User\Downloads\_Pending\cbPlugins\temp\ThreadSearch\ThreadSearchView.cpp 2007-06-28 21:46:04.000000000 -0500
+++ ThreadSearchView.cpp 2007-06-29 18:47:14.171875000 -0500
@@ -8,6 +8,8 @@
* License: GPL
**************************************************************/
+#include <wx/xrc/xmlres.h>
+
#include "messagemanager.h"
#include "configmanager.h"
#include "configurationpanel.h"
@@ -924,13 +926,13 @@
wxString prefix = ConfigManager::GetDataFolder() + _T("/images/16x16/");
- wxString searchButtonPathsEnabled[] = {prefix + wxT("findf.png"),
- prefix + wxT("stop.png") ,
- wxEmptyString};
-
- wxString searchButtonPathsDisabled[] = {prefix + wxT("findfdisabled.png"),
- prefix + wxT("stopdisabled.png") ,
- wxEmptyString};
+ wxString searchButtonPathsEnabled[] = {wxT("findf"),
+ wxT("stop") ,
+ wxEmptyString};
+
+ wxString searchButtonPathsDisabled[] = {wxT("findfdisabled"),
+ wxT("stopdisabled") ,
+ wxEmptyString};
// Gets toolbar search button pointer
wxBitmapButton* pToolBarSearchBtn = static_cast<wxBitmapButton*>(m_pToolBar->FindControl(idBtnSearch));
@@ -939,8 +941,8 @@
if ( label != skip )
{
m_pBtnSearch->SetLabel(searchButtonLabels[label]);
- pToolBarSearchBtn->SetBitmapLabel (wxBitmap(searchButtonPathsEnabled [label], wxBITMAP_TYPE_PNG));
- pToolBarSearchBtn->SetBitmapDisabled(wxBitmap(searchButtonPathsDisabled[label], wxBITMAP_TYPE_PNG));
+ pToolBarSearchBtn->SetBitmapLabel (wxXmlResource::Get()->LoadBitmap(searchButtonPathsEnabled [label]));
+ pToolBarSearchBtn->SetBitmapDisabled(wxXmlResource::Get()->LoadBitmap(searchButtonPathsDisabled [label]));
}
// Sets enable state
ThreadImages.xrc to be put in ThreadSearch.zip
<?xml version="1.0" encoding="utf-8"?>
<resource>
<object class="wxBitmap" name="findf">findf.png</object>
<object class="wxBitmap" name="findfdisabled">findfdisabled.png</object>
<object class="wxBitmap" name="options">options.png</object>
<object class="wxBitmap" name="optionsdisabled">optionsdisabled.png</object>
<object class="wxBitmap" name="stop">stop.png</object>
<object class="wxBitmap" name="stopdisabled">stopdisabled.png</object>
<object class="wxBitmap" name="ThreadSearch">ThreadSearch.png</object>
<object class="wxBitmap" name="ThreadSearchoff">ThreadSearch-off.png</object>
</resource>
Contents of ThreadSearch.zip
findf.png
findfdisabled.png
options.png
optionsdisabled.png
stop.png
stopdisabled.png
ThreadSearch.png
ThreadSearch-off.png
manifest.xml
ThreadImages.xrc
Post Build Step
zip -j9 .\ThreadSearch.zip manifest.xml *.png ThreadImages.xrc
zip -j9 ThreadSearch.cbplugin .\bin\debug\ThreadSearch.dll .\ThreadSearch.zip