summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--rbutil/autodetection.h2
-rw-r--r--rbutil/icons/bin2c.c172
-rw-r--r--rbutil/icons/bootloader_btn.pngbin0 -> 3345 bytes
-rw-r--r--rbutil/icons/doom_btn.pngbin0 -> 3814 bytes
-rw-r--r--rbutil/icons/font_btn.pngbin0 -> 1926 bytes
-rw-r--r--rbutil/icons/rbinstall_btn.pngbin0 -> 3026 bytes
-rw-r--r--rbutil/icons/rembootloader_btn.pngbin0 -> 3693 bytes
-rw-r--r--rbutil/icons/remrb_btn.pngbin0 -> 3634 bytes
-rw-r--r--rbutil/icons/themes_btn.pngbin0 -> 2238 bytes
-rw-r--r--rbutil/rbutil.cbp29
-rw-r--r--rbutil/rbutil.cpp6
-rw-r--r--rbutil/rbutil.h4
-rw-r--r--rbutil/rbutilApp.cpp4
-rw-r--r--rbutil/rbutilFrm.cpp31
-rw-r--r--rbutil/rbutilFrm.h2
15 files changed, 233 insertions, 17 deletions
diff --git a/rbutil/autodetection.h b/rbutil/autodetection.h
index a69b9e4bca..cfd0dbab96 100644
--- a/rbutil/autodetection.h
+++ b/rbutil/autodetection.h
@@ -41,7 +41,7 @@ struct UsbDeviceInfo
41 41
42bool detectDevices(UsbDeviceInfo* tempdevice); 42bool detectDevices(UsbDeviceInfo* tempdevice);
43 43
44wxArrayString getPossibleMountPoints(); /* this funktion has to be implemented for every OS 44wxArrayString getPossibleMountPoints(); /* this funktion has to be implemented for every OS */
45 45
46 46
47/******************************** 47/********************************
diff --git a/rbutil/icons/bin2c.c b/rbutil/icons/bin2c.c
new file mode 100644
index 0000000000..de4bed8348
--- /dev/null
+++ b/rbutil/icons/bin2c.c
@@ -0,0 +1,172 @@
1 // bin2c.c
2 //
3 // convert a binary file into a C source vector
4 //
5 // put into the public domain by Sandro Sigala
6 //
7 // syntax: bin2c [-c] [-z] <input_file> <output_file>
8 //
9 // -c add the "const" keyword to definition
10 // -z terminate the array with a zero (useful for embedded C strings)
11 //
12 // examples:
13 // bin2c -c myimage.png myimage_png.cpp
14 // bin2c -z sometext.txt sometext_txt.cpp
15
16 #include <ctype.h>
17 #include <stdio.h>
18 #include <stdlib.h>
19 #include <string.h>
20
21 #ifndef PATH_MAX
22 #define PATH_MAX 1024
23 #endif
24
25 int useconst = 0;
26 int zeroterminated = 0;
27
28 int myfgetc(FILE *f)
29 {
30 int c = fgetc(f);
31 if (c == EOF && zeroterminated) {
32 zeroterminated = 0;
33 return 0;
34 }
35 return c;
36 }
37
38
39 void process(const char *ifname, const char *ofname)
40 {
41 FILE *ifile, *ofile;
42 /* modified */
43 int counter=0;
44 char buf2[PATH_MAX];
45 char* cp2;
46 char* cp3;
47 if ((cp3 = strrchr(ofname, '/')) != NULL)
48 ++cp3;
49 else {
50 if ((cp3 = strrchr(ofname, '\\')) != NULL)
51 ++cp3;
52 else
53 cp3 = ofname;
54 }
55
56 strcpy(buf2, cp3);
57 cp2 = strrchr(buf2, '.');
58 *cp2 = '.';
59 cp2++;
60 *cp2 = 'h';
61 cp2++;
62 *cp2 ='\0';
63
64
65 ifile = fopen(ifname, "rb");
66 if (ifile == NULL) {
67 fprintf(stderr, "cannot open %s for reading\n", ifname);
68 exit(1);
69 }
70 ofile = fopen(ofname, "wb");
71 if (ofile == NULL) {
72 fprintf(stderr, "cannot open %s for writing\n", ofname);
73 exit(1);
74 }
75 char buf[PATH_MAX], *p;
76 const char *cp;
77 if ((cp = strrchr(ifname, '/')) != NULL)
78 ++cp;
79 else {
80 if ((cp = strrchr(ifname, '\\')) != NULL)
81 ++cp;
82 else
83 cp = ifname;
84 }
85 strcpy(buf, cp);
86 for (p = buf; *p != '\0'; ++p)
87 if (!isalnum(*p))
88 *p = '_';
89 fprintf(ofile,"#include \"%s\" \n\n",buf2);
90 fprintf(ofile, "%sunsigned char %s[] = {\n", useconst ? "const " : "", buf);
91 int c, col = 1;
92 while ((c = myfgetc(ifile)) != EOF) {
93 counter++;
94 if (col >= 78 - 6) {
95 fputc('\n', ofile);
96 col = 1;
97 }
98 fprintf(ofile, "0x%.2x, ", c);
99 col += 6;
100
101 }
102 fprintf(ofile, "\n};\n");
103
104 /* modified */
105 fprintf(ofile,"int %s_length = %i; \n",buf,counter);
106
107
108 FILE *o2file;
109 o2file = fopen(buf2, "wb");
110 if (o2file == NULL) {
111 fprintf(stderr, "cannot open %s for writing\n", buf2);
112 exit(1);
113 }
114
115 fprintf(o2file, "#ifndef __%s__ \n", buf);
116 fprintf(o2file, "#define __%s__ \n", buf);
117
118 fprintf(o2file, "extern %sunsigned char %s[]; \n\n", useconst ? "const " : "", buf);
119 fprintf(o2file, "extern int %s_length; \n\n", buf);
120
121 fprintf(o2file, "#endif \n");
122
123 fclose(ifile);
124 fclose(ofile);
125 fclose(o2file);
126 }
127
128 void usage(void)
129 {
130 fprintf(stderr, "usage: bin2c <input_files> \n");
131 exit(1);
132 }
133
134 int main(int argc, char **argv)
135 {
136 if (argc < 2) {
137 usage();
138 }
139 int i;
140 for(i = 1;i < argc ; i++)
141 {
142 char buf[PATH_MAX];
143 char* cp;
144 strcpy(buf, argv[i]);
145 cp = strrchr(buf, '.');
146 cp++;
147 strcpy(cp,"cpp");
148 process(argv[i], buf);
149 }
150
151
152 /*
153 while (argc > 3) {
154 if (!strcmp(argv[1], "-c")) {
155 useconst = 1;
156 --argc;
157 ++argv;
158 } else if (!strcmp(argv[1], "-z")) {
159 zeroterminated = 1;
160 --argc;
161 ++argv;
162 } else {
163 usage();
164 }
165 }
166 if (argc != 3) {
167 usage();
168 }
169 process(argv[1], argv[2]);
170 */
171 return 0;
172 }
diff --git a/rbutil/icons/bootloader_btn.png b/rbutil/icons/bootloader_btn.png
new file mode 100644
index 0000000000..3590c9c4b9
--- /dev/null
+++ b/rbutil/icons/bootloader_btn.png
Binary files differ
diff --git a/rbutil/icons/doom_btn.png b/rbutil/icons/doom_btn.png
new file mode 100644
index 0000000000..9a53a283e9
--- /dev/null
+++ b/rbutil/icons/doom_btn.png
Binary files differ
diff --git a/rbutil/icons/font_btn.png b/rbutil/icons/font_btn.png
new file mode 100644
index 0000000000..dd47a2912a
--- /dev/null
+++ b/rbutil/icons/font_btn.png
Binary files differ
diff --git a/rbutil/icons/rbinstall_btn.png b/rbutil/icons/rbinstall_btn.png
new file mode 100644
index 0000000000..c37ebec263
--- /dev/null
+++ b/rbutil/icons/rbinstall_btn.png
Binary files differ
diff --git a/rbutil/icons/rembootloader_btn.png b/rbutil/icons/rembootloader_btn.png
new file mode 100644
index 0000000000..8abf1da30e
--- /dev/null
+++ b/rbutil/icons/rembootloader_btn.png
Binary files differ
diff --git a/rbutil/icons/remrb_btn.png b/rbutil/icons/remrb_btn.png
new file mode 100644
index 0000000000..bd484b96c1
--- /dev/null
+++ b/rbutil/icons/remrb_btn.png
Binary files differ
diff --git a/rbutil/icons/themes_btn.png b/rbutil/icons/themes_btn.png
new file mode 100644
index 0000000000..264ba79460
--- /dev/null
+++ b/rbutil/icons/themes_btn.png
Binary files differ
diff --git a/rbutil/rbutil.cbp b/rbutil/rbutil.cbp
index 9351795977..ab819fbd61 100644
--- a/rbutil/rbutil.cbp
+++ b/rbutil/rbutil.cbp
@@ -91,6 +91,9 @@
91 <Add directory="$(#WX.lib)" /> 91 <Add directory="$(#WX.lib)" />
92 <Add directory=".\" /> 92 <Add directory=".\" />
93 </Linker> 93 </Linker>
94 <ExtraCommands>
95 <Add before="cmd /c icons\bin2c.exe icons\*.png" />
96 </ExtraCommands>
94 <Unit filename="Makefile" /> 97 <Unit filename="Makefile" />
95 <Unit filename="archos.ico" /> 98 <Unit filename="archos.ico" />
96 <Unit filename="autodetection.cpp" /> 99 <Unit filename="autodetection.cpp" />
@@ -103,6 +106,32 @@
103 <Unit filename="h100sums.h" /> 106 <Unit filename="h100sums.h" />
104 <Unit filename="h120sums.h" /> 107 <Unit filename="h120sums.h" />
105 <Unit filename="h300sums.h" /> 108 <Unit filename="h300sums.h" />
109 <Unit filename="icons\bin2c.c">
110 <Option compilerVar="CC" />
111 <Option compile="0" />
112 <Option link="0" />
113 </Unit>
114 <Unit filename="icons\bootloader_btn.cpp" />
115 <Unit filename="icons\bootloader_btn.h" />
116 <Unit filename="icons\bootloader_btn.png" />
117 <Unit filename="icons\doom_btn.cpp" />
118 <Unit filename="icons\doom_btn.h" />
119 <Unit filename="icons\doom_btn.png" />
120 <Unit filename="icons\font_btn.cpp" />
121 <Unit filename="icons\font_btn.h" />
122 <Unit filename="icons\font_btn.png" />
123 <Unit filename="icons\rbinstall_btn.cpp" />
124 <Unit filename="icons\rbinstall_btn.h" />
125 <Unit filename="icons\rbinstall_btn.png" />
126 <Unit filename="icons\rembootloader_btn.cpp" />
127 <Unit filename="icons\rembootloader_btn.h" />
128 <Unit filename="icons\rembootloader_btn.png" />
129 <Unit filename="icons\remrb_btn.cpp" />
130 <Unit filename="icons\remrb_btn.h" />
131 <Unit filename="icons\remrb_btn.png" />
132 <Unit filename="icons\themes_btn.cpp" />
133 <Unit filename="icons\themes_btn.h" />
134 <Unit filename="icons\themes_btn.png" />
106 <Unit filename="install_3d.xpm" /> 135 <Unit filename="install_3d.xpm" />
107 <Unit filename="install_dialogs.cpp" /> 136 <Unit filename="install_dialogs.cpp" />
108 <Unit filename="install_dialogs.h" /> 137 <Unit filename="install_dialogs.h" />
diff --git a/rbutil/rbutil.cpp b/rbutil/rbutil.cpp
index d7ee3ed529..a36d1a0b94 100644
--- a/rbutil/rbutil.cpp
+++ b/rbutil/rbutil.cpp
@@ -21,6 +21,12 @@
21#include "rbutil.h" 21#include "rbutil.h"
22#include "installlog.h" 22#include "installlog.h"
23 23
24/* this function gets a Bitmap from embedded memory */
25wxBitmap wxGetBitmapFromMemory(const unsigned char *data,int length)
26{
27 wxMemoryInputStream istream( data,length);
28 return wxBitmap(wxImage(istream, wxBITMAP_TYPE_ANY, -1), -1);
29}
24 30
25// This class allows us to return directories as well as files to 31// This class allows us to return directories as well as files to
26// wxDir::Traverse 32// wxDir::Traverse
diff --git a/rbutil/rbutil.h b/rbutil/rbutil.h
index f8a88d4e8d..3c61bd0c4e 100644
--- a/rbutil/rbutil.h
+++ b/rbutil/rbutil.h
@@ -59,6 +59,7 @@
59#include <wx/notebook.h> 59#include <wx/notebook.h>
60#include <wx/html/htmlwin.h> 60#include <wx/html/htmlwin.h>
61#include <wx/hyperlink.h> 61#include <wx/hyperlink.h>
62#include <wx/mstream.h>
62 63
63#ifdef __WXMSW__ 64#ifdef __WXMSW__
64#define PATH_SEP "\\" 65#define PATH_SEP "\\"
@@ -132,6 +133,7 @@ public:
132 133
133extern GlobalVars* gv; 134extern GlobalVars* gv;
134 135
136
135wxString wxFindAppPath(const wxString& argv0, const wxString& cwd, 137wxString wxFindAppPath(const wxString& argv0, const wxString& cwd,
136 const wxString& appVariableName); 138 const wxString& appVariableName);
137int DownloadURL(wxString src, wxString dest); 139int DownloadURL(wxString src, wxString dest);
@@ -143,6 +145,8 @@ bool checkZip(wxString zipname);
143wxString stream_err_str(int errnum); 145wxString stream_err_str(int errnum);
144bool rm_rf(wxString file); 146bool rm_rf(wxString file);
145 147
148wxBitmap wxGetBitmapFromMemory(const unsigned char *data,int length);
149
146 150
147#define ERR_DIALOG(msg, title) \ 151#define ERR_DIALOG(msg, title) \
148 wxLogError(wxT("%s: %s"), ((wxString) title).c_str(), ((wxString) msg).c_str()) 152 wxLogError(wxT("%s: %s"), ((wxString) title).c_str(), ((wxString) msg).c_str())
diff --git a/rbutil/rbutilApp.cpp b/rbutil/rbutilApp.cpp
index a9101e2656..3bc5d59305 100644
--- a/rbutil/rbutilApp.cpp
+++ b/rbutil/rbutilApp.cpp
@@ -78,6 +78,8 @@ bool rbutilFrmApp::OnInit()
78 } 78 }
79 ReadUserConfig(); 79 ReadUserConfig();
80 80
81 wxInitAllImageHandlers(); //init Image handlers
82
81 rbutilFrm *myFrame = new rbutilFrm(NULL); 83 rbutilFrm *myFrame = new rbutilFrm(NULL);
82 SetTopWindow(myFrame); 84 SetTopWindow(myFrame);
83 85
@@ -86,8 +88,6 @@ bool rbutilFrmApp::OnInit()
86 initIpodpatcher(); // reserve mem for ipodpatcher 88 initIpodpatcher(); // reserve mem for ipodpatcher
87 initSansaPatcher(); // reserve mem for sansapatcher 89 initSansaPatcher(); // reserve mem for sansapatcher
88 90
89 wxInitAllImageHandlers(); //init Image handlers
90
91 wxLogVerbose(wxT("=== end rbUtilFrmApp::OnInit()")); 91 wxLogVerbose(wxT("=== end rbUtilFrmApp::OnInit()"));
92 return TRUE; 92 return TRUE;
93} 93}
diff --git a/rbutil/rbutilFrm.cpp b/rbutil/rbutilFrm.cpp
index 0dc85c09b0..2aa2b362ca 100644
--- a/rbutil/rbutilFrm.cpp
+++ b/rbutil/rbutilFrm.cpp
@@ -22,19 +22,21 @@
22#include "credits.h" 22#include "credits.h"
23 23
24#include "rbutilFrm_XPM.xpm" 24#include "rbutilFrm_XPM.xpm"
25#include "install_3d.xpm" 25#include "icons/rbinstall_btn.h"
26#include "uninstall_3d.xpm" 26#include "icons/remrb_btn.h"
27#include "fonts_3d.xpm" 27#include "icons/font_btn.h"
28#include "tools2_3d.xpm" 28#include "icons/bootloader_btn.h"
29#include "icons/rembootloader_btn.h"
30#include "icons/themes_btn.h"
31#include "icons/doom_btn.h"
32
29#include "rblogo.xpm" 33#include "rblogo.xpm"
30#include "untools2_3d.xpm"
31#include "themes_3d.xpm"
32#include "doom_3d.xpm"
33 34
34#include "bootloaders.h" 35#include "bootloaders.h"
35#include "install_dialogs.h" 36#include "install_dialogs.h"
36 37
37 38
39
38//---------------------------------------------------------------------------- 40//----------------------------------------------------------------------------
39// rbutilFrm 41// rbutilFrm
40//---------------------------------------------------------------------------- 42//----------------------------------------------------------------------------
@@ -125,7 +127,8 @@ void rbutilFrm::CreateGUIControls(void)
125 wxFlexGridSizer* WxFlexGridSizer1 = new wxFlexGridSizer(2,2,0,0); 127 wxFlexGridSizer* WxFlexGridSizer1 = new wxFlexGridSizer(2,2,0,0);
126 WxStaticBoxSizer3->Add(WxFlexGridSizer1,0,wxGROW | wxALL,0); 128 WxStaticBoxSizer3->Add(WxFlexGridSizer1,0,wxGROW | wxALL,0);
127 129
128 wxBitmap BootloaderInstallButton (tools2_3d_xpm); 130
131 wxBitmap BootloaderInstallButton (wxGetBitmapFromMemory(bootloader_btn_png,bootloader_btn_png_length));
129 WxBitmapButton4 = new wxBitmapButton(installpage, ID_BOOTLOADER_BTN, 132 WxBitmapButton4 = new wxBitmapButton(installpage, ID_BOOTLOADER_BTN,
130 BootloaderInstallButton, wxPoint(0,0), wxSize(64,54), 133 BootloaderInstallButton, wxPoint(0,0), wxSize(64,54),
131 wxRAISED_BORDER | wxBU_AUTODRAW, wxDefaultValidator,wxT("Bootloader Installation")); 134 wxRAISED_BORDER | wxBU_AUTODRAW, wxDefaultValidator,wxT("Bootloader Installation"));
@@ -141,7 +144,7 @@ void rbutilFrm::CreateGUIControls(void)
141 WxFlexGridSizer1->Add(WxStaticText5, 0, 144 WxFlexGridSizer1->Add(WxStaticText5, 0,
142 wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL,5); 145 wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL,5);
143 146
144 wxBitmap WxBitmapButton1_BITMAP (install_3d_xpm); 147 wxBitmap WxBitmapButton1_BITMAP (wxGetBitmapFromMemory(rbinstall_btn_png,rbinstall_btn_png_length));
145 WxBitmapButton1 = new wxBitmapButton(installpage, ID_INSTALL_BTN, 148 WxBitmapButton1 = new wxBitmapButton(installpage, ID_INSTALL_BTN,
146 WxBitmapButton1_BITMAP, wxPoint(0,0), wxSize(64,54), 149 WxBitmapButton1_BITMAP, wxPoint(0,0), wxSize(64,54),
147 wxRAISED_BORDER | wxBU_AUTODRAW, wxDefaultValidator, 150 wxRAISED_BORDER | wxBU_AUTODRAW, wxDefaultValidator,
@@ -172,7 +175,7 @@ void rbutilFrm::CreateGUIControls(void)
172 wxFlexGridSizer* WxFlexGridSizer2 = new wxFlexGridSizer(2,2,0,0); 175 wxFlexGridSizer* WxFlexGridSizer2 = new wxFlexGridSizer(2,2,0,0);
173 WxStaticBoxSizer4->Add(WxFlexGridSizer2,0,wxGROW | wxALL,0); 176 WxStaticBoxSizer4->Add(WxFlexGridSizer2,0,wxGROW | wxALL,0);
174 177
175 wxBitmap FontInstallButton (fonts_3d_xpm); 178 wxBitmap FontInstallButton (wxGetBitmapFromMemory(font_btn_png,font_btn_png_length));
176 WxBitmapButton3 = new wxBitmapButton(themepage, ID_FONT_BTN, 179 WxBitmapButton3 = new wxBitmapButton(themepage, ID_FONT_BTN,
177 FontInstallButton, wxPoint(0,0), wxSize(64,54), 180 FontInstallButton, wxPoint(0,0), wxSize(64,54),
178 wxRAISED_BORDER | wxBU_AUTODRAW,wxDefaultValidator, wxT("Font installation")); 181 wxRAISED_BORDER | wxBU_AUTODRAW,wxDefaultValidator, wxT("Font installation"));
@@ -189,7 +192,7 @@ void rbutilFrm::CreateGUIControls(void)
189 WxFlexGridSizer2->Add(WxStaticText4, 0, 192 WxFlexGridSizer2->Add(WxStaticText4, 0,
190 wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL,5); 193 wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL,5);
191 194
192 wxBitmap ThemesInstallButton (themes_3d_xpm); 195 wxBitmap ThemesInstallButton (wxGetBitmapFromMemory(themes_btn_png,themes_btn_png_length));
193 WxBitmapButton5 = new wxBitmapButton(themepage, ID_THEMES_BTN, 196 WxBitmapButton5 = new wxBitmapButton(themepage, ID_THEMES_BTN,
194 ThemesInstallButton, wxPoint(0,0), wxSize(64,54), 197 ThemesInstallButton, wxPoint(0,0), wxSize(64,54),
195 wxRAISED_BORDER | wxBU_AUTODRAW,wxDefaultValidator, wxT("Theme installation")); 198 wxRAISED_BORDER | wxBU_AUTODRAW,wxDefaultValidator, wxT("Theme installation"));
@@ -203,7 +206,7 @@ void rbutilFrm::CreateGUIControls(void)
203 wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL,5); 206 wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL,5);
204 207
205 208
206 wxBitmap DoomInstallButton (doom_3d_xpm); 209 wxBitmap DoomInstallButton (wxGetBitmapFromMemory(doom_btn_png,doom_btn_png_length));
207 WxBitmapButton6 = new wxBitmapButton(themepage, ID_DOOM_BTN, 210 WxBitmapButton6 = new wxBitmapButton(themepage, ID_DOOM_BTN,
208 DoomInstallButton, wxPoint(0,0), wxSize(64,54), 211 DoomInstallButton, wxPoint(0,0), wxSize(64,54),
209 wxRAISED_BORDER | wxBU_AUTODRAW,wxDefaultValidator, wxT("Freedoom installation")); 212 wxRAISED_BORDER | wxBU_AUTODRAW,wxDefaultValidator, wxT("Freedoom installation"));
@@ -233,7 +236,7 @@ void rbutilFrm::CreateGUIControls(void)
233 wxFlexGridSizer* WxFlexGridSizer3 = new wxFlexGridSizer(2,2,0,0); 236 wxFlexGridSizer* WxFlexGridSizer3 = new wxFlexGridSizer(2,2,0,0);
234 WxStaticBoxSizer5->Add(WxFlexGridSizer3,0,wxGROW | wxALL,0); 237 WxStaticBoxSizer5->Add(WxFlexGridSizer3,0,wxGROW | wxALL,0);
235 238
236 wxBitmap WxBitmapButton2_BITMAP (uninstall_3d_xpm); 239 wxBitmap WxBitmapButton2_BITMAP (wxGetBitmapFromMemory(remrb_btn_png,remrb_btn_png_length));
237 WxBitmapButton2 = new wxBitmapButton(uninstallpage, ID_REMOVE_BTN, 240 WxBitmapButton2 = new wxBitmapButton(uninstallpage, ID_REMOVE_BTN,
238 WxBitmapButton2_BITMAP, wxPoint(0,0), wxSize(64,54), 241 WxBitmapButton2_BITMAP, wxPoint(0,0), wxSize(64,54),
239 wxRAISED_BORDER | wxBU_AUTODRAW,wxDefaultValidator, wxT("Rockbox uninstallation")); 242 wxRAISED_BORDER | wxBU_AUTODRAW,wxDefaultValidator, wxT("Rockbox uninstallation"));
@@ -246,7 +249,7 @@ void rbutilFrm::CreateGUIControls(void)
246 WxFlexGridSizer3->Add(WxStaticText3,0, 249 WxFlexGridSizer3->Add(WxStaticText3,0,
247 wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL,5); 250 wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL,5);
248 251
249 wxBitmap WxBitmapButton4_BITMAP (untools2_3d_xpm); 252 wxBitmap WxBitmapButton4_BITMAP (wxGetBitmapFromMemory(rembootloader_btn_png,rembootloader_btn_png_length));
250 WxBitmapButton4 = new wxBitmapButton(uninstallpage, ID_BOOTLOADERREMOVE_BTN, 253 WxBitmapButton4 = new wxBitmapButton(uninstallpage, ID_BOOTLOADERREMOVE_BTN,
251 WxBitmapButton4_BITMAP, wxPoint(0,0), wxSize(64,54), 254 WxBitmapButton4_BITMAP, wxPoint(0,0), wxSize(64,54),
252 wxRAISED_BORDER | wxBU_AUTODRAW, wxDefaultValidator, 255 wxRAISED_BORDER | wxBU_AUTODRAW, wxDefaultValidator,
diff --git a/rbutil/rbutilFrm.h b/rbutil/rbutilFrm.h
index 0d3b2526e4..64afe97f7a 100644
--- a/rbutil/rbutilFrm.h
+++ b/rbutil/rbutilFrm.h
@@ -43,6 +43,8 @@
43#include "rbutil.h" 43#include "rbutil.h"
44#include "rbutilCtrls.h" 44#include "rbutilCtrls.h"
45 45
46
47
46class rbutilFrm : public wxFrame 48class rbutilFrm : public wxFrame
47{ 49{
48private: 50private:
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-30 13:34:28 +0000