1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
diff -ruN p7zip_9.20.1/CPP/7zip/UI/FileManager/FM_rc.cpp p7zip_9.20.1-libre/CPP/7zip/UI/FileManager/FM_rc.cpp
--- p7zip_9.20.1/CPP/7zip/UI/FileManager/FM_rc.cpp 2010-11-07 16:55:36.000000000 +0100
+++ p7zip_9.20.1-libre/CPP/7zip/UI/FileManager/FM_rc.cpp 2014-04-17 21:41:48.222298740 +0200
@@ -774,8 +774,6 @@
/////////////////////////////////////////////////////
-#include "res/ParentFolder.h"
-
SevenZipPanel::SevenZipPanel(MyFrame *frame, wxWindow *parent,int id,int panelIndex) :
wxPanel(parent,id) , m_frame(frame), _wList(0)
{
@@ -793,7 +791,7 @@
int sizes[] = {150, 250, 350, -1};
wxArrayString pathArray;
wxBoxSizer *pPathSizer = new wxBoxSizer(wxHORIZONTAL);
- m_pBmpButtonParentFolder = new wxBitmapButton(this, kParentFolderID, wxGetBitmapFromMemory(PARENT_FOLDER), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW);
+ m_pBmpButtonParentFolder = new wxBitmapButton(this, kParentFolderID, wxArtProvider::GetBitmap(wxART_GO_DIR_UP, wxART_TOOLBAR, wxDefaultSize), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW);
m_pComboBoxPath = new wxComboBox(this, _comboBoxID, wxEmptyString, wxDefaultPosition, wxSize(300,-1), pathArray, wxCB_DROPDOWN | wxCB_SORT );
pPathSizer->Add(m_pBmpButtonParentFolder, 0, wxALL|wxEXPAND, 0);
pPathSizer->Add(m_pComboBoxPath, 1, wxALL|wxEXPAND, 5);
diff -ruN p7zip_9.20.1/CPP/7zip/UI/FileManager/makefile.depend p7zip_9.20.1-libre/CPP/7zip/UI/FileManager/makefile.depend
--- p7zip_9.20.1/CPP/7zip/UI/FileManager/makefile.depend 2011-02-19 10:33:17.000000000 +0100
+++ p7zip_9.20.1-libre/CPP/7zip/UI/FileManager/makefile.depend 2014-04-17 21:40:56.504696275 +0200
@@ -714,7 +714,7 @@
res/Move2PNG.h res/DeletePNG.h res/Delete2PNG.h res/InfoPNG.h \
res/Info2PNG.h LangUtils.h ../../../Common/Lang.h \
../../../Common/MyString.h ../../../Windows/ResourceString.h \
- /usr/include/wx-2.8/wx/mstream.h res/ParentFolder.h
+ /usr/include/wx-2.8/wx/mstream.h
OpenCallback.o: OpenCallback.cpp ../../../myWindows/StdAfx.h \
../../../myWindows/config.h ../../../Common/MyWindows.h \
../../../Common/MyGuidDef.h ../../../Common/Types.h \
|
