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; } const wxBitmap& GetBitmap() const { return m_bitmap; }
// for compatibility with wxMSW // 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: private:
wxBitmap m_bitmap; wxBitmap m_bitmap;

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

@@ -67,7 +67,12 @@ public:
const wxBitmap& GetBitmap() const { return m_bitmap; } const wxBitmap& GetBitmap() const { return m_bitmap; }
// for compatibility with wxMSW // 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: private:
wxBitmap m_bitmap; wxBitmap m_bitmap;

112
src/generic/colrdlgg.cpp
View File

@@ -6,7 +6,7 @@
// Created: 04/01/98 // Created: 04/01/98
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem // Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license // Licence: wxWindows license
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__
@@ -40,13 +40,13 @@
IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog) IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog)
BEGIN_EVENT_TABLE(wxGenericColourDialog, wxDialog) BEGIN_EVENT_TABLE(wxGenericColourDialog, wxDialog)
EVT_BUTTON(wxID_ADD_CUSTOM, wxGenericColourDialog::OnAddCustom) EVT_BUTTON(wxID_ADD_CUSTOM, wxGenericColourDialog::OnAddCustom)
EVT_SLIDER(wxID_RED_SLIDER, wxGenericColourDialog::OnRedSlider) EVT_SLIDER(wxID_RED_SLIDER, wxGenericColourDialog::OnRedSlider)
EVT_SLIDER(wxID_GREEN_SLIDER, wxGenericColourDialog::OnGreenSlider) EVT_SLIDER(wxID_GREEN_SLIDER, wxGenericColourDialog::OnGreenSlider)
EVT_SLIDER(wxID_BLUE_SLIDER, wxGenericColourDialog::OnBlueSlider) EVT_SLIDER(wxID_BLUE_SLIDER, wxGenericColourDialog::OnBlueSlider)
EVT_PAINT(wxGenericColourDialog::OnPaint) EVT_PAINT(wxGenericColourDialog::OnPaint)
EVT_MOUSE_EVENTS(wxGenericColourDialog::OnMouseEvent) EVT_MOUSE_EVENTS(wxGenericColourDialog::OnMouseEvent)
EVT_CLOSE(wxGenericColourDialog::OnCloseWindow) EVT_CLOSE(wxGenericColourDialog::OnCloseWindow)
END_EVENT_TABLE() END_EVENT_TABLE()
#endif #endif
@@ -57,59 +57,59 @@ END_EVENT_TABLE()
#define NUM_COLS 48 #define NUM_COLS 48
static wxString wxColourDialogNames[NUM_COLS]={_T("ORANGE"), static wxString wxColourDialogNames[NUM_COLS]={_T("ORANGE"),
_T("GOLDENROD"), _T("GOLDENROD"),
_T("WHEAT"), _T("WHEAT"),
_T("SPRING GREEN"), _T("SPRING GREEN"),
_T("SKY BLUE"), _T("SKY BLUE"),
_T("SLATE BLUE"), _T("SLATE BLUE"),
_T("MEDIUM VIOLET RED"), _T("MEDIUM VIOLET RED"),
_T("PURPLE"), _T("PURPLE"),
_T("RED"), _T("RED"),
_T("YELLOW"), _T("YELLOW"),
_T("MEDIUM SPRING GREEN"), _T("MEDIUM SPRING GREEN"),
_T("PALE GREEN"), _T("PALE GREEN"),
_T("CYAN"), _T("CYAN"),
_T("LIGHT STEEL BLUE"), _T("LIGHT STEEL BLUE"),
_T("ORCHID"), _T("ORCHID"),
_T("LIGHT MAGENTA"), _T("LIGHT MAGENTA"),
_T("BROWN"), _T("BROWN"),
_T("YELLOW"), _T("YELLOW"),
_T("GREEN"), _T("GREEN"),
_T("CADET BLUE"), _T("CADET BLUE"),
_T("MEDIUM BLUE"), _T("MEDIUM BLUE"),
_T("MAGENTA"), _T("MAGENTA"),
_T("MAROON"), _T("MAROON"),
_T("ORANGE RED"), _T("ORANGE RED"),
_T("FIREBRICK"), _T("FIREBRICK"),
_T("CORAL"), _T("CORAL"),
_T("FOREST GREEN"), _T("FOREST GREEN"),
_T("AQUAMARINE"), _T("AQUAMARINE"),
_T("BLUE"), _T("BLUE"),
_T("NAVY"), _T("NAVY"),
_T("THISTLE"), _T("THISTLE"),
_T("MEDIUM VIOLET RED"), _T("MEDIUM VIOLET RED"),
_T("INDIAN RED"), _T("INDIAN RED"),
_T("GOLD"), _T("GOLD"),
_T("MEDIUM SEA GREEN"), _T("MEDIUM SEA GREEN"),
_T("MEDIUM BLUE"), _T("MEDIUM BLUE"),
_T("MIDNIGHT BLUE"), _T("MIDNIGHT BLUE"),
_T("GREY"), _T("GREY"),
_T("PURPLE"), _T("PURPLE"),
_T("KHAKI"), _T("KHAKI"),
_T("BLACK"), _T("BLACK"),
_T("MEDIUM FOREST GREEN"), _T("MEDIUM FOREST GREEN"),
_T("KHAKI"), _T("KHAKI"),
_T("DARK GREY"), _T("DARK GREY"),
_T("SEA GREEN"), _T("SEA GREEN"),
_T("LIGHT GREY"), _T("LIGHT GREY"),
_T("MEDIUM SLATE BLUE"), _T("MEDIUM SLATE BLUE"),
_T("WHITE") _T("WHITE")
}; };
wxGenericColourDialog::wxGenericColourDialog(void) wxGenericColourDialog::wxGenericColourDialog(void)
{ {

128
src/generic/fontdlgg.cpp
View File

@@ -6,7 +6,7 @@
// Created: 04/01/98 // Created: 04/01/98
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem // Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license // Licence: wxWindows license
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__
@@ -44,73 +44,73 @@
IMPLEMENT_DYNAMIC_CLASS(wxGenericFontDialog, wxDialog) IMPLEMENT_DYNAMIC_CLASS(wxGenericFontDialog, wxDialog)
BEGIN_EVENT_TABLE(wxGenericFontDialog, wxDialog) BEGIN_EVENT_TABLE(wxGenericFontDialog, wxDialog)
EVT_CHECKBOX(wxID_FONT_UNDERLINE, wxGenericFontDialog::OnChangeFont) EVT_CHECKBOX(wxID_FONT_UNDERLINE, wxGenericFontDialog::OnChangeFont)
EVT_CHOICE(wxID_FONT_STYLE, wxGenericFontDialog::OnChangeFont) EVT_CHOICE(wxID_FONT_STYLE, wxGenericFontDialog::OnChangeFont)
EVT_CHOICE(wxID_FONT_WEIGHT, wxGenericFontDialog::OnChangeFont) EVT_CHOICE(wxID_FONT_WEIGHT, wxGenericFontDialog::OnChangeFont)
EVT_CHOICE(wxID_FONT_FAMILY, wxGenericFontDialog::OnChangeFont) EVT_CHOICE(wxID_FONT_FAMILY, wxGenericFontDialog::OnChangeFont)
EVT_CHOICE(wxID_FONT_COLOUR, wxGenericFontDialog::OnChangeFont) EVT_CHOICE(wxID_FONT_COLOUR, wxGenericFontDialog::OnChangeFont)
EVT_CHOICE(wxID_FONT_SIZE, wxGenericFontDialog::OnChangeFont) EVT_CHOICE(wxID_FONT_SIZE, wxGenericFontDialog::OnChangeFont)
EVT_PAINT(wxGenericFontDialog::OnPaint) EVT_PAINT(wxGenericFontDialog::OnPaint)
EVT_CLOSE(wxGenericFontDialog::OnCloseWindow) EVT_CLOSE(wxGenericFontDialog::OnCloseWindow)
END_EVENT_TABLE() END_EVENT_TABLE()
#endif #endif
#define NUM_COLS 48 #define NUM_COLS 48
static wxString wxColourDialogNames[NUM_COLS]={_T("ORANGE"), static wxString wxColourDialogNames[NUM_COLS]={_T("ORANGE"),
_T("GOLDENROD"), _T("GOLDENROD"),
_T("WHEAT"), _T("WHEAT"),
_T("SPRING GREEN"), _T("SPRING GREEN"),
_T("SKY BLUE"), _T("SKY BLUE"),
_T("SLATE BLUE"), _T("SLATE BLUE"),
_T("MEDIUM VIOLET RED"), _T("MEDIUM VIOLET RED"),
_T("PURPLE"), _T("PURPLE"),
_T("RED"), _T("RED"),
_T("YELLOW"), _T("YELLOW"),
_T("MEDIUM SPRING GREEN"), _T("MEDIUM SPRING GREEN"),
_T("PALE GREEN"), _T("PALE GREEN"),
_T("CYAN"), _T("CYAN"),
_T("LIGHT STEEL BLUE"), _T("LIGHT STEEL BLUE"),
_T("ORCHID"), _T("ORCHID"),
_T("LIGHT MAGENTA"), _T("LIGHT MAGENTA"),
_T("BROWN"), _T("BROWN"),
_T("YELLOW"), _T("YELLOW"),
_T("GREEN"), _T("GREEN"),
_T("CADET BLUE"), _T("CADET BLUE"),
_T("MEDIUM BLUE"), _T("MEDIUM BLUE"),
_T("MAGENTA"), _T("MAGENTA"),
_T("MAROON"), _T("MAROON"),
_T("ORANGE RED"), _T("ORANGE RED"),
_T("FIREBRICK"), _T("FIREBRICK"),
_T("CORAL"), _T("CORAL"),
_T("FOREST GREEN"), _T("FOREST GREEN"),
_T("AQUARAMINE"), _T("AQUARAMINE"),
_T("BLUE"), _T("BLUE"),
_T("NAVY"), _T("NAVY"),
_T("THISTLE"), _T("THISTLE"),
_T("MEDIUM VIOLET RED"), _T("MEDIUM VIOLET RED"),
_T("INDIAN RED"), _T("INDIAN RED"),
_T("GOLD"), _T("GOLD"),
_T("MEDIUM SEA GREEN"), _T("MEDIUM SEA GREEN"),
_T("MEDIUM BLUE"), _T("MEDIUM BLUE"),
_T("MIDNIGHT BLUE"), _T("MIDNIGHT BLUE"),
_T("GREY"), _T("GREY"),
_T("PURPLE"), _T("PURPLE"),
_T("KHAKI"), _T("KHAKI"),
_T("BLACK"), _T("BLACK"),
_T("MEDIUM FOREST GREEN"), _T("MEDIUM FOREST GREEN"),
_T("KHAKI"), _T("KHAKI"),
_T("DARK GREY"), _T("DARK GREY"),
_T("SEA GREEN"), _T("SEA GREEN"),
_T("LIGHT GREY"), _T("LIGHT GREY"),
_T("MEDIUM SLATE BLUE"), _T("MEDIUM SLATE BLUE"),
_T("WHITE") _T("WHITE")
}; };
/* /*
* Generic wxFontDialog * Generic wxFontDialog
@@ -160,14 +160,12 @@ int wxGenericFontDialog::ShowModal(void)
fontData.chosenFont = dialogFont; fontData.chosenFont = dialogFont;
} }
return ret; return ret;
} }
void wxGenericFontDialog::OnPaint(wxPaintEvent& event) void wxGenericFontDialog::OnPaint(wxPaintEvent& event)
{ {
wxDialog::OnPaint(event);
wxPaintDC dc(this); wxPaintDC dc(this);
PaintFontBackground(dc); PaintFontBackground(dc);
PaintFont(dc); PaintFont(dc);
@@ -230,16 +228,16 @@ void wxGenericFontDialog::CreateWidgets(void)
#if 0 // def __WXMOTIF__ // TODO: This necessary now? #if 0 // def __WXMOTIF__ // TODO: This necessary now?
// We want the pointSizeText to line up on the y axis with the colourChoice // We want the pointSizeText to line up on the y axis with the colourChoice
colourChoice->GetPosition(&fontRect.x, &y); //NL mod colourChoice->GetPosition(&fontRect.x, &y); //NL mod
y+=3; //NL mod y+=3; //NL mod
#endif #endif
wxString *pointSizes = new wxString[40]; wxString *pointSizes = new wxString[40];
int i; int i;
for ( i = 0; i < 40; i++) for ( i = 0; i < 40; i++)
{ {
char buf[5]; char buf[5];
sprintf(buf, "%d", i + 1); sprintf(buf, "%d", i + 1);
pointSizes[i] = buf; pointSizes[i] = buf;
} }
pointSizeChoice = new wxChoice(this, wxID_FONT_SIZE, wxPoint(230, y), wxSize(50, -1), 40, pointSizes); pointSizeChoice = new wxChoice(this, wxID_FONT_SIZE, wxPoint(230, y), wxSize(50, -1), 40, pointSizes);
@@ -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.SetClippingRegion( fontRect.x, fontRect.y, (long)(fontRect.width-2.0), (long)(fontRect.height-2.0));
dc.DrawText(_("ABCDEFGabcdefg12345"), (long)cx, (long)cy); dc.DrawText(_("ABCDEFGabcdefg12345"), (long)cx, (long)cy);
dc.DestroyClippingRegion(); dc.DestroyClippingRegion();
dc.SetFont(wxNullFont); dc.SetFont(wxNullFont);
} }
dc.EndDrawing(); dc.EndDrawing();
} }

9
src/gtk/statbmp.cpp
View File

@@ -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 #endif

9
src/gtk1/statbmp.cpp
View File

@@ -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 #endif