Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-28 15:50:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bit of CVS clean-up

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-12-13 11:27:27 +00:00
parent 137f22e18f
commit bbf7319063
26 changed files with 259 additions and 4894 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/minifram/.cvsignore
+3
View File
@@ -0,0 +1,3 @@
Linux
linux-gnu
linux
samples/minifram/Makefile.in
+1 -1
View File
@@ -7,7 +7,7 @@ OS=@OS@
RULE=bin
# define library name
BIN_TARGET=toolbar
BIN_TARGET=minifram
# define library sources
BIN_SRC=\
test.cpp
samples/notebook/.cvsignore
+3
View File
@@ -0,0 +1,3 @@
Linux
linux-gnu
linux
samples/printing/Cour.afm
-341
View File
File diff suppressed because it is too large Load Diff
samples/printing/CourBo.afm
-341
View File
File diff suppressed because it is too large Load Diff
samples/printing/CourBoO.afm
-341
View File
File diff suppressed because it is too large Load Diff
samples/printing/CourO.afm
-341
View File
File diff suppressed because it is too large Load Diff
samples/printing/Helv.afm
-435
View File
File diff suppressed because it is too large Load Diff
samples/printing/HelvBo.afm
-431
View File
File diff suppressed because it is too large Load Diff
samples/printing/HelvBoO.afm
-429
View File
File diff suppressed because it is too large Load Diff
samples/printing/HelvO.afm
-428
View File
File diff suppressed because it is too large Load Diff
samples/printing/TimesBo.afm
-454
View File
File diff suppressed because it is too large Load Diff
samples/printing/TimesBoO.afm
-438
View File
File diff suppressed because it is too large Load Diff
samples/printing/TimesO.afm
-450
View File
File diff suppressed because it is too large Load Diff
samples/printing/TimesRo.afm
-443
View File
File diff suppressed because it is too large Load Diff
samples/typetest/typetest.cpp
+3 -3
View File
@@ -78,7 +78,7 @@ bool MyApp::OnInit(void)
return TRUE;
}
void MyApp::DoTimeDemo(wxCommandEvent& event)
void MyApp::DoTimeDemo(wxCommandEvent& WXUNUSED(event))
{
wxTextCtrl& textCtrl = * GetTextCtrl();
@@ -88,7 +88,7 @@ void MyApp::DoTimeDemo(wxCommandEvent& event)
textCtrl << "It is now " << (wxString) now << "\n";
}
void MyApp::DoDateDemo(wxCommandEvent& event)
void MyApp::DoDateDemo(wxCommandEvent& WXUNUSED(event))
{
wxTextCtrl& textCtrl = * GetTextCtrl();
@@ -230,7 +230,7 @@ void MyApp::DoDateDemo(wxCommandEvent& event)
textCtrl << "The last date of this year is " << v4.GetYearEnd() << "\n";
}
void MyApp::DoVariantDemo(wxCommandEvent& event)
void MyApp::DoVariantDemo(wxCommandEvent& WXUNUSED(event) )
{
wxTextCtrl& textCtrl = * GetTextCtrl();
samples/wxpoem/.cvsignore
+3
View File
@@ -0,0 +1,3 @@
Linux
linux-gnu
linux
samples/wxpoem/corner1.xpm
+42
View File
@@ -0,0 +1,42 @@
/* XPM */
static char * corner1_xpm[] = {
/* width height ncolors chars_per_pixel */
"32 32 4 1",
/* colors */
" s None c None",
". c #000000",
"+ c #808080",
"@ c #c0c0c0",
/* pixels */
"............................ ",
"...++..++++++++++++++++++.... ",
".+..++...@@@@@@@+++++++++++... ",
".@+..+++...@@@@@@@@@@++++++++.. ",
".@++..@+++...@@@@@@@@@@@@+++++. ",
"..@++..@++++...@@@@@@@@@@@@+++..",
"..@@++..@@++++...@@@@@@@@@@@+++.",
".+.@@++..@@@++++...@@@@@@@@@@++.",
".+.@@+++..@@@@++++...@@@@@@@@@+.",
".++.@@+++..@@@@@+++++...@@@@@@..",
".++..@@+++..@@@@@@+++++...@@@.. ",
".@++.@@@+++..@@@@@@@+++++...... ",
".@++..@@@+++..@@@@@@@@+++++... ",
".@+++.@@@++++..@@@@@@@@@+++++.. ",
".@@++..@@@++++..@@@@@@@@@+++++. ",
".@@+++.@@@@++++..@@@@@@@@@@+++..",
".@@@++..@@@@++++..@@@@@@@@@@+++.",
".@@@+++.@@@@@++++..@@@@@@@@@@++.",
".@@@@++..@@@@@++++..@@@@@@@@@@+.",
".@@@@+++..@@@@+++++..@@@@@@@@@+.",
".@@@@++++.@@@@@+++++..@@@@@@@@. ",
".@@@@@+++..@@@@@+++++..@@@@@@@. ",
".@@@@@++++.@@@@@@+++++..@@@@@. ",
".@@@@@@+++..@@@@@@+++++..@@.. ",
".@@@@@@++++.@@@@@@++++++... ",
".@@@@@@@+++..@@@@@@++++++. ",
".@@@@@@@++++..@@@@@@+++++. ",
".@@@@@@@@++++.@@@@@@@+++. ",
"..@@@@@@@++++..@@@@@++++. ",
" ..@@@@@++++++.@@@@+++.. ",
" ..++++++++....+++.. ",
" ........ .... "};
samples/wxpoem/corner2.xpm
+42
View File
@@ -0,0 +1,42 @@
/* XPM */
static char * corner2_xpm[] = {
/* width height ncolors chars_per_pixel */
"32 32 4 1",
/* colors */
" s None c None",
". c #000000",
"+ c #c0c0c0",
"@ c #808080",
/* pixels */
" ............................",
" ....++++++++++++++++++..++...",
" ...+++++++++++@@@@@@@...++..+.",
" ..++++++++@@@@@@@@@@...+++..+@.",
" .+++++@@@@@@@@@@@@...+++@..++@.",
"..+++@@@@@@@@@@@@...++++@..++@..",
".+++@@@@@@@@@@@...++++@@..++@@..",
".++@@@@@@@@@@...++++@@@..++@@.+.",
".+@@@@@@@@@...++++@@@@..+++@@.+.",
"..@@@@@@...+++++@@@@@..+++@@.++.",
" ..@@@...+++++@@@@@@..+++@@..++.",
" ......+++++@@@@@@@..+++@@@.++@.",
" ...+++++@@@@@@@@..+++@@@..++@.",
" ..+++++@@@@@@@@@..++++@@@.+++@.",
" .+++++@@@@@@@@@..++++@@@..++@@.",
"..+++@@@@@@@@@@..++++@@@@.+++@@.",
".+++@@@@@@@@@@..++++@@@@..++@@@.",
".++@@@@@@@@@@..++++@@@@@.+++@@@.",
".+@@@@@@@@@@..++++@@@@@..++@@@@.",
".+@@@@@@@@@..+++++@@@@..+++@@@@.",
" .@@@@@@@@..+++++@@@@@.++++@@@@.",
" .@@@@@@@..+++++@@@@@..+++@@@@@.",
" .@@@@@..+++++@@@@@@.++++@@@@@.",
" ..@@..+++++@@@@@@..+++@@@@@@.",
" ...++++++@@@@@@.++++@@@@@@.",
" .++++++@@@@@@..+++@@@@@@@.",
" .+++++@@@@@@..++++@@@@@@@.",
" .+++@@@@@@@.++++@@@@@@@@.",
" .++++@@@@@..++++@@@@@@@..",
" ..+++@@@@.++++++@@@@@.. ",
" ..+++....++++++++.. ",
" .... ........ "};
samples/wxpoem/corner3.xpm
+42
View File
@@ -0,0 +1,42 @@
/* XPM */
static char * corner3_xpm[] = {
/* width height ncolors chars_per_pixel */
"32 32 4 1",
/* colors */
" s None c None",
". c #000000",
"+ c #c0c0c0",
"@ c #808080",
/* pixels */
" ........ .... ",
" ..++++++++....+++.. ",
" ..@@@@@++++++.@@@@+++.. ",
"..@@@@@@@++++..@@@@@++++. ",
".@@@@@@@@++++.@@@@@@@+++. ",
".@@@@@@@++++..@@@@@@+++++. ",
".@@@@@@@+++..@@@@@@++++++. ",
".@@@@@@++++.@@@@@@++++++... ",
".@@@@@@+++..@@@@@@+++++..@@.. ",
".@@@@@++++.@@@@@@+++++..@@@@@. ",
".@@@@@+++..@@@@@+++++..@@@@@@@. ",
".@@@@++++.@@@@@+++++..@@@@@@@@. ",
".@@@@+++..@@@@+++++..@@@@@@@@@+.",
".@@@@++..@@@@@++++..@@@@@@@@@@+.",
".@@@+++.@@@@@++++..@@@@@@@@@@++.",
".@@@++..@@@@++++..@@@@@@@@@@+++.",
".@@+++.@@@@++++..@@@@@@@@@@+++..",
".@@++..@@@++++..@@@@@@@@@+++++. ",
".@+++.@@@++++..@@@@@@@@@+++++.. ",
".@++..@@@+++..@@@@@@@@+++++... ",
".@++.@@@+++..@@@@@@@+++++...... ",
".++..@@+++..@@@@@@+++++...@@@.. ",
".++.@@+++..@@@@@+++++...@@@@@@..",
".+.@@+++..@@@@++++...@@@@@@@@@+.",
".+.@@++..@@@++++...@@@@@@@@@@++.",
"..@@++..@@++++...@@@@@@@@@@@+++.",
"..@++..@++++...@@@@@@@@@@@@+++..",
".@++..@+++...@@@@@@@@@@@@+++++. ",
".@+..+++...@@@@@@@@@@++++++++.. ",
".+..++...@@@@@@@+++++++++++... ",
"...++..++++++++++++++++++.... ",
"............................ "};
samples/wxpoem/corner4.xpm
+42
View File
@@ -0,0 +1,42 @@
/* XPM */
static char * corner4_xpm[] = {
/* width height ncolors chars_per_pixel */
"32 32 4 1",
/* colors */
" s None c None",
". c #000000",
"+ c #c0c0c0",
"@ c #808080",
/* pixels */
" .... ........ ",
" ..+++....++++++++.. ",
" ..+++@@@@.++++++@@@@@.. ",
" .++++@@@@@..++++@@@@@@@..",
" .+++@@@@@@@.++++@@@@@@@@.",
" .+++++@@@@@@..++++@@@@@@@.",
" .++++++@@@@@@..+++@@@@@@@.",
" ...++++++@@@@@@.++++@@@@@@.",
" ..@@..+++++@@@@@@..+++@@@@@@.",
" .@@@@@..+++++@@@@@@.++++@@@@@.",
" .@@@@@@@..+++++@@@@@..+++@@@@@.",
" .@@@@@@@@..+++++@@@@@.++++@@@@.",
".+@@@@@@@@@..+++++@@@@..+++@@@@.",
".+@@@@@@@@@@..++++@@@@@..++@@@@.",
".++@@@@@@@@@@..++++@@@@@.+++@@@.",
".+++@@@@@@@@@@..++++@@@@..++@@@.",
"..+++@@@@@@@@@@..++++@@@@.+++@@.",
" .+++++@@@@@@@@@..++++@@@..++@@.",
" ..+++++@@@@@@@@@..++++@@@.+++@.",
" ...+++++@@@@@@@@..+++@@@..++@.",
" ......+++++@@@@@@@..+++@@@.++@.",
" ..@@@...+++++@@@@@@..+++@@..++.",
"..@@@@@@...+++++@@@@@..+++@@.++.",
".+@@@@@@@@@...++++@@@@..+++@@.+.",
".++@@@@@@@@@@...++++@@@..++@@.+.",
".+++@@@@@@@@@@@...++++@@..++@@..",
"..+++@@@@@@@@@@@@...++++@..++@..",
" .+++++@@@@@@@@@@@@...+++@..++@.",
" ..++++++++@@@@@@@@@@...+++..+@.",
" ...+++++++++++@@@@@@@...++..+.",
" ....++++++++++++++++++..++...",
" ............................"};
samples/wxpoem/wxpoem.cpp
+30 -16
View File
@@ -35,6 +35,13 @@
#include "wxpoem.h"
#ifdef __WXGTK__
#include "corner1.xpm"
#include "corner2.xpm"
#include "corner3.xpm"
#include "corner4.xpm"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -322,7 +329,7 @@ void MainWindow::ScanBuffer(wxDC *dc, bool DrawIt, int *max_x, int *max_y)
int x = (int)((width - xx)/2.0);
dc->SetFont(* NormalFont);
dc->SetTextForeground(* wxBLACK);
dc->DrawText(line, (float)x, (float)y);
dc->DrawText(line, x, y);
}
}
}
@@ -343,7 +350,7 @@ void MainWindow::ScanBuffer(wxDC *dc, bool DrawIt, int *max_x, int *max_y)
int x = (int)((width - xx)/2.0);
dc->SetFont(* NormalFont);
dc->SetTextForeground(* wxBLACK);
dc->DrawText(cont, (float)x, (float)y);
dc->DrawText(cont, x, y);
}
y += 2*char_height;
}
@@ -405,16 +412,16 @@ void MainWindow::ScanBuffer(wxDC *dc, bool DrawIt, int *max_x, int *max_y)
dc->DrawLine(THICK_LINE_BORDER, THICK_LINE_BORDER,
width-THICK_LINE_BORDER, THICK_LINE_BORDER);
#ifdef __WXMSW__
//#ifdef __WXMSW__
// Draw icons
dc->DrawIcon(* Corner1, 0.0, 0.0);
dc->DrawIcon(* Corner2, (float)(width-32.0), 0.0);
dc->DrawIcon(* Corner1, 0, 0);
dc->DrawIcon(* Corner2, int(width-32), 0);
int y2 = height - 32;
int x2 = (width-32);
dc->DrawIcon(* Corner3, 0.0, (float)y2);
dc->DrawIcon(* Corner4, (float)x2, (float)y2);
#endif
dc->DrawIcon(* Corner3, 0, y2);
dc->DrawIcon(* Corner4, x2, y2);
//#endif
}
}
@@ -632,6 +639,12 @@ bool MyApp::OnInit()
Corner3 = new wxIcon("icon_3");
Corner4 = new wxIcon("icon_4");
#endif
#ifdef __WXGTK__
Corner1 = new wxIcon( corner1_xpm );
Corner2 = new wxIcon( corner2_xpm );
Corner3 = new wxIcon( corner3_xpm );
Corner4 = new wxIcon( corner4_xpm );
#endif
TheMainWindow->GetIndexLoadPoem();
TheMainWindow->Resize();
@@ -650,12 +663,13 @@ int MyApp::OnExit()
delete DarkGreyPen;
delete WhitePen;
#ifdef __WXMSW__
//#ifdef __WXMSW__
delete Corner1;
delete Corner2;
delete Corner3;
delete Corner4;
#endif
//#endif
delete NormalFont;
delete BoldFont;
delete ItalicFont;
@@ -664,7 +678,7 @@ int MyApp::OnExit()
return 0;
}
void MainWindow::OnCloseWindow(wxCloseEvent& event)
void MainWindow::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
{
WritePreferences();
this->Destroy();
@@ -688,7 +702,7 @@ MyCanvas::MyCanvas(wxFrame *frame, wxWindowID id, const wxPoint& pos, const wxSi
}
// Define the repainting behaviour
void MyCanvas::OnPaint(wxPaintEvent& event)
void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
{
wxPaintDC dc(this);
@@ -717,7 +731,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
#if 0 // wx_motif
FakePopupMenu(popupMenu, x, y);
#else
PopupMenu(popupMenu, x, y);
PopupMenu(popupMenu, (int)x, (int)y );
#endif
}
else if (event.LeftDown())
@@ -839,8 +853,8 @@ bool LoadPoem(char *file_name, long position)
{
int ch = 0;
int i = 0;
int j = 0;
int indexn = 0;
// int j = 0;
// int indexn = 0;
char buf[100];
long data;
FILE *data_file;
@@ -1054,7 +1068,7 @@ bool Compile(void)
return TRUE;
}
void PopupFunction(wxMenu& menu, wxCommandEvent& event)
void PopupFunction(wxMenu& /*menu*/, wxCommandEvent& event)
{
switch (event.m_commandInt)
{
samples/wxpoem/wxpoem.xpm
+47
View File
@@ -0,0 +1,47 @@
/* XPM */
static char * wxpoem_xpm[] = {
/* width height ncolors chars_per_pixel */
"32 32 9 1",
/* colors */
" s None c None",
". c #800000",
"+ c #008000",
"@ c #808000",
"# c #c0c0c0",
"$ c #ff0000",
"% c #00ff00",
"& c #ffff00",
"* c #0000ff",
/* pixels */
" **** ",
" ********&&* ",
" ******&&&&&&&&&&&&*** ",
" *****&&&&&&&&&&&&&&&&&&&* ",
" **************************** ",
" *&&&&&&&&&&&&&&&&&&&&&&&&&&* ",
" *&************************&* ",
" *&************************&* ",
" *&************************&* ",
" *&*&&&@*@&@*@&&*@&@&@*@&@*&* ",
" *&*&**&*&*&*&***&*&*&*&***&* ",
" *&*&&&@*&*&*&&**&*&*&*&&@*&* ",
" *&*&****&*&*&***&*&*&***&*&* ",
" *&*&****&*&*&***&***&***&*&* ",
" *&*&****@&@*@&&*&***&*@&@*&* ",
" *&************************&* ",
" *&************************&* ",
" *&************************&* ",
" *&*****$$$****************&* ",
" *&***...$$$$**************&* ",
" *&***$$....$**************&* ",
" *&****$$$$..******%++*****&* ",
" *&****$$$$$.%%**+%+%%*****&* ",
" *&******$$$**%%*%+%%+*****&* ",
" *&*************%+%%%******&* ",
" *&**************%%%*******&* ",
" *&****************%%%*****&* ",
" *&******************%%****&* ",
" *&&&&&&&&&&&&&&&&&&&&%%&&&&* ",
" ***********************%%*** ",
" %% ",
" #%% "};
setup/.cvsignore
+1
View File
@@ -2,3 +2,4 @@ Makefile
Linux
linux-gnu
setup.h
linux
src/gtk/utilsgtk.cpp
-1
View File
@@ -86,7 +86,6 @@ void wxGetMousePosition( int* x, int* y )
bool wxColourDisplay(void)
{
wxFAIL_MSG( "wxColourDisplay always returns TRUE" );
return TRUE;
}
src/gtk1/utilsgtk.cpp
-1
View File
@@ -86,7 +86,6 @@ void wxGetMousePosition( int* x, int* y )
bool wxColourDisplay(void)
{
wxFAIL_MSG( "wxColourDisplay always returns TRUE" );
return TRUE;
}