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

misc minor fixes I forgot to commit before

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-06-28 22:06:24 +00:00
parent 6c582c35b9
commit c35414dbe4
6 changed files with 185 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/gtk/statbmp.h
View File

@@ -67,7 +67,12 @@ public:
const wxBitmap& GetBitmap() const { return m_bitmap; }
// for compatibility with wxMSW
wxIcon& GetIcon();
const wxIcon& GetIcon() const
{
// don't use wxDynamicCast, icons and bitmaps are really the same thing
// in wxGTK
return (const wxIcon &)m_bitmap;
}
private:
wxBitmap m_bitmap;

7
include/wx/gtk1/statbmp.h
View File

@@ -67,7 +67,12 @@ public:
const wxBitmap& GetBitmap() const { return m_bitmap; }
// for compatibility with wxMSW
wxIcon& GetIcon();
const wxIcon& GetIcon() const
{
// don't use wxDynamicCast, icons and bitmaps are really the same thing
// in wxGTK
return (const wxIcon &)m_bitmap;
}
private:
wxBitmap m_bitmap;

140
src/generic/colrdlgg.cpp
View File

@@ -6,7 +6,7 @@
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
@@ -40,13 +40,13 @@
IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog)
BEGIN_EVENT_TABLE(wxGenericColourDialog, wxDialog)
EVT_BUTTON(wxID_ADD_CUSTOM, wxGenericColourDialog::OnAddCustom)
EVT_SLIDER(wxID_RED_SLIDER, wxGenericColourDialog::OnRedSlider)
EVT_SLIDER(wxID_GREEN_SLIDER, wxGenericColourDialog::OnGreenSlider)
EVT_SLIDER(wxID_BLUE_SLIDER, wxGenericColourDialog::OnBlueSlider)
EVT_PAINT(wxGenericColourDialog::OnPaint)
EVT_MOUSE_EVENTS(wxGenericColourDialog::OnMouseEvent)
EVT_CLOSE(wxGenericColourDialog::OnCloseWindow)
EVT_BUTTON(wxID_ADD_CUSTOM, wxGenericColourDialog::OnAddCustom)
EVT_SLIDER(wxID_RED_SLIDER, wxGenericColourDialog::OnRedSlider)
EVT_SLIDER(wxID_GREEN_SLIDER, wxGenericColourDialog::OnGreenSlider)
EVT_SLIDER(wxID_BLUE_SLIDER, wxGenericColourDialog::OnBlueSlider)
EVT_PAINT(wxGenericColourDialog::OnPaint)
EVT_MOUSE_EVENTS(wxGenericColourDialog::OnMouseEvent)
EVT_CLOSE(wxGenericColourDialog::OnCloseWindow)
END_EVENT_TABLE()
#endif
@@ -57,59 +57,59 @@ END_EVENT_TABLE()
#define NUM_COLS 48
static wxString wxColourDialogNames[NUM_COLS]={_T("ORANGE"),
_T("GOLDENROD"),
_T("WHEAT"),
_T("SPRING GREEN"),
_T("SKY BLUE"),
_T("SLATE BLUE"),
_T("MEDIUM VIOLET RED"),
_T("PURPLE"),
_T("GOLDENROD"),
_T("WHEAT"),
_T("SPRING GREEN"),
_T("SKY BLUE"),
_T("SLATE BLUE"),
_T("MEDIUM VIOLET RED"),
_T("PURPLE"),
_T("RED"),
_T("YELLOW"),
_T("MEDIUM SPRING GREEN"),
_T("PALE GREEN"),
_T("CYAN"),
_T("LIGHT STEEL BLUE"),
_T("ORCHID"),
_T("LIGHT MAGENTA"),
_T("BROWN"),
_T("YELLOW"),
_T("GREEN"),
_T("CADET BLUE"),
_T("MEDIUM BLUE"),
_T("MAGENTA"),
_T("MAROON"),
_T("ORANGE RED"),
_T("RED"),
_T("YELLOW"),
_T("MEDIUM SPRING GREEN"),
_T("PALE GREEN"),
_T("CYAN"),
_T("LIGHT STEEL BLUE"),
_T("ORCHID"),
_T("LIGHT MAGENTA"),
_T("FIREBRICK"),
_T("CORAL"),
_T("FOREST GREEN"),
_T("AQUAMARINE"),
_T("BLUE"),
_T("NAVY"),
_T("THISTLE"),
_T("MEDIUM VIOLET RED"),
_T("INDIAN RED"),
_T("GOLD"),
_T("MEDIUM SEA GREEN"),
_T("MEDIUM BLUE"),
_T("MIDNIGHT BLUE"),
_T("GREY"),
_T("PURPLE"),
_T("KHAKI"),
_T("BLACK"),
_T("MEDIUM FOREST GREEN"),
_T("KHAKI"),
_T("DARK GREY"),
_T("SEA GREEN"),
_T("LIGHT GREY"),
_T("MEDIUM SLATE BLUE"),
_T("WHITE")
};
_T("BROWN"),
_T("YELLOW"),
_T("GREEN"),
_T("CADET BLUE"),
_T("MEDIUM BLUE"),
_T("MAGENTA"),
_T("MAROON"),
_T("ORANGE RED"),
_T("FIREBRICK"),
_T("CORAL"),
_T("FOREST GREEN"),
_T("AQUAMARINE"),
_T("BLUE"),
_T("NAVY"),
_T("THISTLE"),
_T("MEDIUM VIOLET RED"),
_T("INDIAN RED"),
_T("GOLD"),
_T("MEDIUM SEA GREEN"),
_T("MEDIUM BLUE"),
_T("MIDNIGHT BLUE"),
_T("GREY"),
_T("PURPLE"),
_T("KHAKI"),
_T("BLACK"),
_T("MEDIUM FOREST GREEN"),
_T("KHAKI"),
_T("DARK GREY"),
_T("SEA GREEN"),
_T("LIGHT GREY"),
_T("MEDIUM SLATE BLUE"),
_T("WHITE")
};
wxGenericColourDialog::wxGenericColourDialog(void)
{
@@ -138,14 +138,14 @@ void wxGenericColourDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data)
{
dialogParent = parent;
if (data)
colourData = *data;
InitializeColours();
CalculateMeasurements();
CreateWidgets();
return TRUE;
}
@@ -229,7 +229,7 @@ void wxGenericColourDialog::CalculateMeasurements(void)
void wxGenericColourDialog::CreateWidgets(void)
{
wxBeginBusyCursor();
wxButton *okButton = new wxButton(this, wxID_OK, _("OK"), wxPoint(okButtonX, buttonY), wxSize(75,-1) );
int bw, bh;
okButton->GetSize(&bw, &bh);
@@ -246,7 +246,7 @@ void wxGenericColourDialog::CreateWidgets(void)
int sliderSpacing = 45;
int sliderHeight = 160;
#endif
redSlider = new wxSlider(this, wxID_RED_SLIDER, 0, 0, 255,
wxPoint(sliderX, 10), wxSize(-1, sliderHeight), wxVERTICAL|wxSL_LABELS);
greenSlider = new wxSlider(this, wxID_GREEN_SLIDER, 0, 0, 255,
@@ -297,7 +297,7 @@ void wxGenericColourDialog::PaintBasicColours(wxDC& dc)
for (j = 0; j < 8; j++)
{
int ptr = i*8 + j;
int x = (j*(smallRectangleSize.x+gridSpacing) + standardColoursRect.x);
int y = (i*(smallRectangleSize.y+gridSpacing) + standardColoursRect.y);
@@ -322,7 +322,7 @@ void wxGenericColourDialog::PaintCustomColours(wxDC& dc)
for (j = 0; j < 8; j++)
{
int ptr = i*8 + j;
int x = (j*(smallRectangleSize.x+gridSpacing)) + customColoursRect.x;
int y = (i*(smallRectangleSize.y+gridSpacing)) + customColoursRect.y;
@@ -376,18 +376,18 @@ void wxGenericColourDialog::PaintHighlight(wxDC& dc, bool draw)
dc.SetPen(*wxBLACK_PEN);
else
dc.SetPen(*wxLIGHT_GREY_PEN);
dc.SetBrush(*wxTRANSPARENT_BRUSH);
dc.DrawRectangle( x, y, (smallRectangleSize.x + (2*deltaX)), (smallRectangleSize.y + (2*deltaY)));
}
dc.EndDrawing();
}
void wxGenericColourDialog::PaintCustomColour(wxDC& dc)
{
dc.BeginDrawing();
dc.SetPen(*wxBLACK_PEN);
wxBrush *brush = new wxBrush(singleCustomColour, wxSOLID);
@@ -452,7 +452,7 @@ void wxGenericColourDialog::OnAddCustom(wxCommandEvent& WXUNUSED(event))
customColours[colourSelection].Set(singleCustomColour.Red(), singleCustomColour.Green(), singleCustomColour.Blue());
colourData.SetColour(customColours[colourSelection]);
colourData.SetCustomColour(colourSelection, customColours[colourSelection]);
PaintCustomColours(dc);
}
@@ -460,7 +460,7 @@ void wxGenericColourDialog::OnRedSlider(wxCommandEvent& WXUNUSED(event))
{
if (!redSlider)
return;
wxClientDC dc(this);
singleCustomColour.Set(redSlider->GetValue(), singleCustomColour.Green(), singleCustomColour.Blue());
PaintCustomColour(dc);

152
src/generic/fontdlgg.cpp
View File

@@ -6,7 +6,7 @@
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
@@ -44,73 +44,73 @@
IMPLEMENT_DYNAMIC_CLASS(wxGenericFontDialog, wxDialog)
BEGIN_EVENT_TABLE(wxGenericFontDialog, wxDialog)
EVT_CHECKBOX(wxID_FONT_UNDERLINE, wxGenericFontDialog::OnChangeFont)
EVT_CHOICE(wxID_FONT_STYLE, wxGenericFontDialog::OnChangeFont)
EVT_CHOICE(wxID_FONT_WEIGHT, wxGenericFontDialog::OnChangeFont)
EVT_CHOICE(wxID_FONT_FAMILY, wxGenericFontDialog::OnChangeFont)
EVT_CHOICE(wxID_FONT_COLOUR, wxGenericFontDialog::OnChangeFont)
EVT_CHOICE(wxID_FONT_SIZE, wxGenericFontDialog::OnChangeFont)
EVT_PAINT(wxGenericFontDialog::OnPaint)
EVT_CLOSE(wxGenericFontDialog::OnCloseWindow)
EVT_CHECKBOX(wxID_FONT_UNDERLINE, wxGenericFontDialog::OnChangeFont)
EVT_CHOICE(wxID_FONT_STYLE, wxGenericFontDialog::OnChangeFont)
EVT_CHOICE(wxID_FONT_WEIGHT, wxGenericFontDialog::OnChangeFont)
EVT_CHOICE(wxID_FONT_FAMILY, wxGenericFontDialog::OnChangeFont)
EVT_CHOICE(wxID_FONT_COLOUR, wxGenericFontDialog::OnChangeFont)
EVT_CHOICE(wxID_FONT_SIZE, wxGenericFontDialog::OnChangeFont)
EVT_PAINT(wxGenericFontDialog::OnPaint)
EVT_CLOSE(wxGenericFontDialog::OnCloseWindow)
END_EVENT_TABLE()
#endif
#define NUM_COLS 48
static wxString wxColourDialogNames[NUM_COLS]={_T("ORANGE"),
_T("GOLDENROD"),
_T("WHEAT"),
_T("SPRING GREEN"),
_T("SKY BLUE"),
_T("SLATE BLUE"),
_T("MEDIUM VIOLET RED"),
_T("PURPLE"),
_T("GOLDENROD"),
_T("WHEAT"),
_T("SPRING GREEN"),
_T("SKY BLUE"),
_T("SLATE BLUE"),
_T("MEDIUM VIOLET RED"),
_T("PURPLE"),
_T("RED"),
_T("YELLOW"),
_T("MEDIUM SPRING GREEN"),
_T("PALE GREEN"),
_T("CYAN"),
_T("LIGHT STEEL BLUE"),
_T("ORCHID"),
_T("LIGHT MAGENTA"),
_T("BROWN"),
_T("YELLOW"),
_T("GREEN"),
_T("CADET BLUE"),
_T("MEDIUM BLUE"),
_T("MAGENTA"),
_T("MAROON"),
_T("ORANGE RED"),
_T("RED"),
_T("YELLOW"),
_T("MEDIUM SPRING GREEN"),
_T("PALE GREEN"),
_T("CYAN"),
_T("LIGHT STEEL BLUE"),
_T("ORCHID"),
_T("LIGHT MAGENTA"),
_T("FIREBRICK"),
_T("CORAL"),
_T("FOREST GREEN"),
_T("AQUARAMINE"),
_T("BLUE"),
_T("NAVY"),
_T("THISTLE"),
_T("MEDIUM VIOLET RED"),
_T("INDIAN RED"),
_T("GOLD"),
_T("MEDIUM SEA GREEN"),
_T("MEDIUM BLUE"),
_T("MIDNIGHT BLUE"),
_T("GREY"),
_T("PURPLE"),
_T("KHAKI"),
_T("BLACK"),
_T("MEDIUM FOREST GREEN"),
_T("KHAKI"),
_T("DARK GREY"),
_T("SEA GREEN"),
_T("LIGHT GREY"),
_T("MEDIUM SLATE BLUE"),
_T("WHITE")
};
_T("BROWN"),
_T("YELLOW"),
_T("GREEN"),
_T("CADET BLUE"),
_T("MEDIUM BLUE"),
_T("MAGENTA"),
_T("MAROON"),
_T("ORANGE RED"),
_T("FIREBRICK"),
_T("CORAL"),
_T("FOREST GREEN"),
_T("AQUARAMINE"),
_T("BLUE"),
_T("NAVY"),
_T("THISTLE"),
_T("MEDIUM VIOLET RED"),
_T("INDIAN RED"),
_T("GOLD"),
_T("MEDIUM SEA GREEN"),
_T("MEDIUM BLUE"),
_T("MIDNIGHT BLUE"),
_T("GREY"),
_T("PURPLE"),
_T("KHAKI"),
_T("BLACK"),
_T("MEDIUM FOREST GREEN"),
_T("KHAKI"),
_T("DARK GREY"),
_T("SEA GREEN"),
_T("LIGHT GREY"),
_T("MEDIUM SLATE BLUE"),
_T("WHITE")
};
/*
* Generic wxFontDialog
@@ -137,17 +137,17 @@ void wxGenericFontDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
{
EndModal(wxID_CANCEL);
}
bool wxGenericFontDialog::Create(wxWindow *parent, wxFontData *data)
{
dialogParent = parent;
if (data)
fontData = *data;
InitializeFont();
CreateWidgets();
return TRUE;
}
@@ -160,14 +160,12 @@ int wxGenericFontDialog::ShowModal(void)
fontData.chosenFont = dialogFont;
}
return ret;
return ret;
}
void wxGenericFontDialog::OnPaint(wxPaintEvent& event)
{
wxDialog::OnPaint(event);
wxPaintDC dc(this);
PaintFontBackground(dc);
PaintFont(dc);
@@ -202,7 +200,7 @@ void wxGenericFontDialog::CreateWidgets(void)
static char *styles[] = { "Normal", "Italic", "Slant" };
static char *weights[] = { "Normal", "Light", "Bold" };
*/
wxString
*families = new wxString[6],
*styles = new wxString[3],
@@ -219,7 +217,7 @@ void wxGenericFontDialog::CreateWidgets(void)
weights[0] = _("Normal");
weights[1] = _("Light");
weights[2] = _("Bold");
int x=-1;
int y=40;
familyChoice = new wxChoice(this, wxID_FONT_FAMILY, wxPoint(10, 10), wxSize(120, -1), 5, families);
@@ -230,16 +228,16 @@ void wxGenericFontDialog::CreateWidgets(void)
#if 0 // def __WXMOTIF__ // TODO: This necessary now?
// We want the pointSizeText to line up on the y axis with the colourChoice
colourChoice->GetPosition(&fontRect.x, &y); //NL mod
y+=3; //NL mod
y+=3; //NL mod
#endif
wxString *pointSizes = new wxString[40];
int i;
for ( i = 0; i < 40; i++)
{
char buf[5];
sprintf(buf, "%d", i + 1);
pointSizes[i] = buf;
char buf[5];
sprintf(buf, "%d", i + 1);
pointSizes[i] = buf;
}
pointSizeChoice = new wxChoice(this, wxID_FONT_SIZE, wxPoint(230, y), wxSize(50, -1), 40, pointSizes);
@@ -251,7 +249,7 @@ void wxGenericFontDialog::CreateWidgets(void)
pointSizeChoice->GetSize(&x, &y); //NL mod
// Calculate the position of the bottom of the pointSizeChoice, and place
// the fontRect there (+5 for a nice gap)
// the fontRect there (+5 for a nice gap)
fontRect.y+=y+5; //NL mod
@@ -265,7 +263,7 @@ void wxGenericFontDialog::CreateWidgets(void)
weightChoice->SetStringSelection(wxFontWeightIntToString(dialogFont.GetWeight()));
wxString name(wxTheColourDatabase->FindName(fontData.fontColour));
colourChoice->SetStringSelection(name);
underLineCheckBox->SetValue(dialogFont.GetUnderlined());
pointSizeChoice->SetSelection(dialogFont.GetPointSize()-1);
@@ -328,7 +326,7 @@ void wxGenericFontDialog::PaintFont(wxDC& dc)
dc.SetClippingRegion( fontRect.x, fontRect.y, (long)(fontRect.width-2.0), (long)(fontRect.height-2.0));
dc.DrawText(_("ABCDEFGabcdefg12345"), (long)cx, (long)cy);
dc.DestroyClippingRegion();
dc.SetFont(wxNullFont);
dc.SetFont(wxNullFont);
}
dc.EndDrawing();
}
@@ -336,7 +334,7 @@ void wxGenericFontDialog::PaintFont(wxDC& dc)
void wxGenericFontDialog::OnChangeFont(wxCommandEvent& WXUNUSED(event))
{
if (!m_useEvents) return;
int fontFamily = 0; /* shut up buggy egcs warnings */
fontFamily = wxFontFamilyStringToInt(WXSTRINGCAST familyChoice->GetStringSelection());
int fontWeight = 0;
@@ -416,7 +414,7 @@ int wxFontFamilyStringToInt(wxChar *family)
{
if (!family)
return wxSWISS;
if (wxStrcmp(family, _T("Roman")) == 0)
return wxROMAN;
else if (wxStrcmp(family, _T("Decorative")) == 0)

37
src/gtk/statbmp.cpp
View File

@@ -28,31 +28,31 @@ wxStaticBitmap::wxStaticBitmap(void)
{
}
wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
const wxPoint &pos, const wxSize &size,
wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
const wxPoint &pos, const wxSize &size,
long style, const wxString &name )
{
Create( parent, id, bitmap, pos, size, style, name );
}
bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
const wxPoint &pos, const wxSize &size,
bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
const wxPoint &pos, const wxSize &size,
long style, const wxString &name )
{
m_needParent = TRUE;
wxSize newSize = size;
PreCreation( parent, id, pos, size, style, name );
m_bitmap = bitmap;
if (m_bitmap.Ok())
{
GdkBitmap *mask = (GdkBitmap *) NULL;
if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap();
m_widget = gtk_pixmap_new( m_bitmap.GetPixmap(), mask );
if (newSize.x == -1) newSize.x = m_bitmap.GetWidth();
if (newSize.y == -1) newSize.y = m_bitmap.GetHeight();
SetSize( newSize.x, newSize.y );
@@ -61,20 +61,20 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
{
m_widget = gtk_label_new( "Bitmap" );
}
m_parent->DoAddChild( this );
PostCreation();
Show( TRUE );
return TRUE;
}
void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
{
m_bitmap = bitmap;
if (m_bitmap.Ok())
{
GdkBitmap *mask = (GdkBitmap *) NULL;
@@ -83,13 +83,4 @@ void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
}
}
wxIcon& wxStaticBitmap::GetIcon()
{
wxIcon *icon = wxDynamicCast(&m_bitmap, wxIcon);
if (!icon) return wxNullIcon;
return *icon;
}
#endif

37
src/gtk1/statbmp.cpp
View File

@@ -28,31 +28,31 @@ wxStaticBitmap::wxStaticBitmap(void)
{
}
wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
const wxPoint &pos, const wxSize &size,
wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
const wxPoint &pos, const wxSize &size,
long style, const wxString &name )
{
Create( parent, id, bitmap, pos, size, style, name );
}
bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
const wxPoint &pos, const wxSize &size,
bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
const wxPoint &pos, const wxSize &size,
long style, const wxString &name )
{
m_needParent = TRUE;
wxSize newSize = size;
PreCreation( parent, id, pos, size, style, name );
m_bitmap = bitmap;
if (m_bitmap.Ok())
{
GdkBitmap *mask = (GdkBitmap *) NULL;
if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap();
m_widget = gtk_pixmap_new( m_bitmap.GetPixmap(), mask );
if (newSize.x == -1) newSize.x = m_bitmap.GetWidth();
if (newSize.y == -1) newSize.y = m_bitmap.GetHeight();
SetSize( newSize.x, newSize.y );
@@ -61,20 +61,20 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
{
m_widget = gtk_label_new( "Bitmap" );
}
m_parent->DoAddChild( this );
PostCreation();
Show( TRUE );
return TRUE;
}
void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
{
m_bitmap = bitmap;
if (m_bitmap.Ok())
{
GdkBitmap *mask = (GdkBitmap *) NULL;
@@ -83,13 +83,4 @@ void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
}
}
wxIcon& wxStaticBitmap::GetIcon()
{
wxIcon *icon = wxDynamicCast(&m_bitmap, wxIcon);
if (!icon) return wxNullIcon;
return *icon;
}
#endif