// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
#ifndef __GTKSETTINGSH__
#define __GTKSETTINGSH__
#include "wx/pen.h"
#include "wx/font.h"
-class WXDLLEXPORT wxSystemSettings: public wxObject
+class wxSystemSettings: public wxObject
{
public:
- inline wxSystemSettings(void) {}
+ inline wxSystemSettings() {}
inline static void Init() {}
static void Done();
wxCursor *m_cursor;
wxFont m_font;
wxColour m_backgroundColour;
- wxColour m_foregroundColour ;
+ wxColour m_foregroundColour;
wxRegion m_updateRegion;
long m_windowStyle;
bool m_isShown;
bool m_resizing;
GdkGC *m_scrollGC;
GtkStyle *m_widgetStyle;
+ bool m_isStaticBox;
wxInsertChildFunction m_insertCallback;
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
#ifndef __GTKSETTINGSH__
#define __GTKSETTINGSH__
#include "wx/pen.h"
#include "wx/font.h"
-class WXDLLEXPORT wxSystemSettings: public wxObject
+class wxSystemSettings: public wxObject
{
public:
- inline wxSystemSettings(void) {}
+ inline wxSystemSettings() {}
inline static void Init() {}
static void Done();
wxCursor *m_cursor;
wxFont m_font;
wxColour m_backgroundColour;
- wxColour m_foregroundColour ;
+ wxColour m_foregroundColour;
wxRegion m_updateRegion;
long m_windowStyle;
bool m_isShown;
bool m_resizing;
GdkGC *m_scrollGC;
GtkStyle *m_widgetStyle;
+ bool m_isStaticBox;
wxInsertChildFunction m_insertCallback;
wxTextCtrl *textCtrl = (wxTextCtrl *)m_validatorWindow;
int keyCode = event.KeyCode();
- if ( keyCode == WXK_DELETE || keyCode == WXK_RETURN || keyCode == WXK_BACK)
+ if (keyCode == WXK_DELETE || keyCode == WXK_RETURN || keyCode == WXK_BACK ||
+ keyCode == WXK_HOME || keyCode == WXK_LEFT || keyCode == WXK_UP ||
+ keyCode == WXK_RIGHT || keyCode == WXK_DOWN || keyCode == WXK_PRIOR ||
+ keyCode == WXK_NEXT || keyCode == WXK_END || keyCode == WXK_HOME)
{
textCtrl->wxTextCtrl::OnChar(event);
return ;
"FIREBRICK",
"CORAL",
"FOREST GREEN",
- "AQUARAMINE",
+ "AQUAMARINE",
"BLUE",
"NAVY",
"THISTLE",
if ( data )
printData = *data;
- int buttonWidth = 65;
- int buttonHeight = 25;
- int spacing = 5;
- int yPos = 5;
- int xPos = 5;
-
- wxButton *okButton = new wxButton(this, wxID_OK, _("OK"), wxPoint(5, yPos), wxSize(buttonWidth, buttonHeight));
- (void) new wxButton(this, wxID_CANCEL, _("Cancel"), wxPoint(buttonWidth + 5 + spacing, yPos), wxSize(buttonWidth, buttonHeight));
-
- setupButton = new wxButton(this, wxPRINTID_SETUP, _("Setup..."), wxPoint(buttonWidth*2 + 5 + 2*spacing, yPos), wxSize(buttonWidth, buttonHeight));
-
- okButton->SetDefault();
- okButton->SetFocus();
-
- yPos += 35;
+ (void)new wxStaticBox( this, -1, _( "Printer options" ), wxPoint( 5, 5), wxSize( 300, 60 ) );
+ printToFileCheckBox = new wxCheckBox(this, wxPRINTID_PRINTTOFILE, _("Print to File"), wxPoint(20, 25) );
+
+ setupButton = new wxButton(this, wxPRINTID_SETUP, _("Setup..."), wxPoint(160, 25), wxSize(100, -1));
+
wxString *choices = new wxString[2];
choices[0] = _("All");
choices[1] = _("Pages");
if(printData.GetFromPage() != 0)
{
rangeRadioBox = new wxRadioBox(this, wxPRINTID_RANGE, _("Print Range"),
- wxPoint(5, yPos), wxSize(-1, -1), 2, choices, 2);
+ wxPoint(5, 80), wxSize(-1, -1), 2, choices, 1, wxRA_VERTICAL);
rangeRadioBox->SetSelection(1);
}
- yPos += 60;
- xPos = 5;
- int staticWidth = 45;
- int textWidth = 40;
- spacing = 10;
-
if(printData.GetFromPage() != 0)
{
- (void) new wxStaticText(this, wxPRINTID_STATIC, _("From:"), wxPoint(xPos, yPos));
- xPos += staticWidth;
+ (void) new wxStaticText(this, wxPRINTID_STATIC, _("From:"), wxPoint(5, 135));
- fromText = new wxTextCtrl(this, wxPRINTID_FROM, "", wxPoint(xPos, yPos), wxSize(textWidth, -1));
- xPos += spacing + textWidth;
+ fromText = new wxTextCtrl(this, wxPRINTID_FROM, "", wxPoint(45, 130), wxSize(40, -1));
- (void) new wxStaticText(this, wxPRINTID_STATIC, _("To:"), wxPoint(xPos, yPos));
- xPos += staticWidth;
+ (void) new wxStaticText(this, wxPRINTID_STATIC, _("To:"), wxPoint(100, 135));
- toText = new wxTextCtrl(this, wxPRINTID_TO, "", wxPoint(xPos, yPos), wxSize(textWidth, -1));
- xPos += spacing + textWidth;
+ toText = new wxTextCtrl(this, wxPRINTID_TO, "", wxPoint(133, 130), wxSize(40, -1));
}
- (void) new wxStaticText(this, wxPRINTID_STATIC, _("Copies:"), wxPoint(xPos, yPos));
- xPos += spacing + staticWidth;
-
- noCopiesText = new wxTextCtrl(this, wxPRINTID_COPIES, "", wxPoint(xPos, yPos), wxSize(textWidth, -1));
+ (void) new wxStaticText(this, wxPRINTID_STATIC, _("Copies:"), wxPoint(200, 135));
- yPos += 30;
- xPos = 5;
+ noCopiesText = new wxTextCtrl(this, wxPRINTID_COPIES, "", wxPoint(252, 130), wxSize(40, -1));
- printToFileCheckBox = new wxCheckBox(this, wxPRINTID_PRINTTOFILE, _("Print to File"), wxPoint(xPos, yPos));
+ wxButton *okButton = new wxButton(this, wxID_OK, _("OK"), wxPoint(40, 180), wxSize(100, -1));
+ (void) new wxButton(this, wxID_CANCEL, _("Cancel"), wxPoint(180, 180), wxSize(100, -1));
+ okButton->SetDefault();
+ okButton->SetFocus();
Fit();
Centre(wxBOTH);
choices[1] = _("Landscape");
orientationRadioBox = new wxRadioBox(this, wxPRINTID_ORIENTATION, _("Orientation"),
- wxPoint(10, 80), wxSize(-1, -1), 2, choices, 2);
+ wxPoint(10, 80), wxSize(-1, -1), 2, choices, 1, wxRA_VERTICAL );
orientationRadioBox->SetSelection(0);
(void) new wxStaticBox(this, wxPRINTID_STATIC, _("Options"), wxPoint(10, 130), wxSize(200,50) );
printerOptionsText = new wxTextCtrl(this, wxPRINTID_OPTIONS, "", wxPoint(260, 135), wxSize(150, -1));
- wxButton *okButton = new wxButton(this, wxID_OK, _("OK"), wxPoint(240, 200), wxSize(100, -1));
- (void) new wxButton(this, wxID_CANCEL, _("Cancel"), wxPoint(360, 200), wxSize(100, -1));
+ wxButton *okButton = new wxButton(this, wxID_OK, _("OK"), wxPoint(80, 200), wxSize(100, -1));
+ (void) new wxButton(this, wxID_CANCEL, _("Cancel"), wxPoint(270, 200), wxSize(100, -1));
okButton->SetDefault();
okButton->SetFocus();
wxColourRefData::wxColourRefData()
{
- m_color.red = 0;
- m_color.green = 0;
- m_color.blue = 0;
- m_color.pixel = 0;
- m_colormap = (GdkColormap *) NULL;
- m_hasPixel = FALSE;
+ m_color.red = 0;
+ m_color.green = 0;
+ m_color.blue = 0;
+ m_color.pixel = 0;
+ m_colormap = (GdkColormap *) NULL;
+ m_hasPixel = FALSE;
}
wxColourRefData::~wxColourRefData()
{
- FreeColour();
+ FreeColour();
}
void wxColourRefData::FreeColour()
wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue )
{
- m_refData = new wxColourRefData();
- M_COLDATA->m_color.red = ((unsigned short)red) << SHIFT;
- M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT;
- M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
- M_COLDATA->m_color.pixel = 0;
+ m_refData = new wxColourRefData();
+ M_COLDATA->m_color.red = ((unsigned short)red) << SHIFT;
+ M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT;
+ M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
+ M_COLDATA->m_color.pixel = 0;
}
void wxColour::InitFromName( const wxString &colourName )
{
- wxNode *node = (wxNode *) NULL;
- if ( (wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) )
- {
- wxColour *col = (wxColour*)node->Data();
- UnRef();
- if (col) Ref( *col );
- }
- else
- {
- m_refData = new wxColourRefData();
- if (!gdk_color_parse( colourName, &M_COLDATA->m_color ))
+ wxNode *node = (wxNode *) NULL;
+ if ( (wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) )
{
- wxFAIL_MSG( "wxColour: couldn't find colour" );
- delete m_refData;
- m_refData = (wxObjectRefData *) NULL;
+ wxColour *col = (wxColour*)node->Data();
+ UnRef();
+ if (col) Ref( *col );
+ }
+ else
+ {
+ m_refData = new wxColourRefData();
+ if (!gdk_color_parse( colourName, &M_COLDATA->m_color ))
+ {
+ wxFAIL_MSG( "wxColour: couldn't find colour" );
+ printf( "Colourname %s.\n", WXSTRINGCAST colourName );
+
+ delete m_refData;
+ m_refData = (wxObjectRefData *) NULL;
+ }
}
- }
}
wxColour::wxColour( const wxColour& col )
{
- Ref( col );
+ Ref( col );
}
wxColour::~wxColour()
wxColour& wxColour::operator = ( const wxColour& col )
{
- if (*this == col) return (*this);
- Ref( col );
- return *this;
+ if (*this == col) return (*this);
+ Ref( col );
+ return *this;
}
bool wxColour::operator == ( const wxColour& col )
{
- return m_refData == col.m_refData;
+ return m_refData == col.m_refData;
}
bool wxColour::operator != ( const wxColour& col)
{
- return m_refData != col.m_refData;
+ return m_refData != col.m_refData;
}
void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
{
- UnRef();
- m_refData = new wxColourRefData();
- M_COLDATA->m_color.red = ((unsigned short)red) << SHIFT;
- M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT;
- M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
- M_COLDATA->m_color.pixel = 0;
+ UnRef();
+ m_refData = new wxColourRefData();
+ M_COLDATA->m_color.red = ((unsigned short)red) << SHIFT;
+ M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT;
+ M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
+ M_COLDATA->m_color.pixel = 0;
}
unsigned char wxColour::Red() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid colour" );
- return 0;
- }
+ wxCHECK_MSG( Ok(), 0, "invalid colour" );
- return (unsigned char)(M_COLDATA->m_color.red >> SHIFT);
+ return (unsigned char)(M_COLDATA->m_color.red >> SHIFT);
}
unsigned char wxColour::Green() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid colour" );
- return 0;
- }
+ wxCHECK_MSG( Ok(), 0, "invalid colour" );
- return (unsigned char)(M_COLDATA->m_color.green >> SHIFT);
+ return (unsigned char)(M_COLDATA->m_color.green >> SHIFT);
}
unsigned char wxColour::Blue() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid colour" );
- return 0;
- }
+ wxCHECK_MSG( Ok(), 0, "invalid colour" );
- return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT);
+ return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT);
}
bool wxColour::Ok() const
{
- return (m_refData != NULL);
+ return (m_refData != NULL);
}
void wxColour::CalcPixel( GdkColormap *cmap )
{
- if (!Ok()) return;
+ if (!Ok()) return;
- if ((M_COLDATA->m_hasPixel) && (M_COLDATA->m_colormap == cmap)) return;
- M_COLDATA->FreeColour();
+ if ((M_COLDATA->m_hasPixel) && (M_COLDATA->m_colormap == cmap)) return;
+ M_COLDATA->FreeColour();
GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap;
if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
M_COLDATA->m_hasPixel = TRUE;
M_COLDATA->m_color.pixel = index;
}
- else
- {
- M_COLDATA->m_hasPixel = gdk_color_alloc( cmap, &M_COLDATA->m_color );
- }
+ else
+ {
+ M_COLDATA->m_hasPixel = gdk_color_alloc( cmap, &M_COLDATA->m_color );
+ }
- M_COLDATA->m_colormap = cmap;
+ M_COLDATA->m_colormap = cmap;
}
int wxColour::GetPixel() const
{
- if (!Ok()) return 0;
+ wxCHECK_MSG( Ok(), 0, "invalid colour" );
- return M_COLDATA->m_color.pixel;
+ return M_COLDATA->m_color.pixel;
}
GdkColor *wxColour::GetColor() const
{
- if (!Ok()) return (GdkColor *) NULL;
+ wxCHECK_MSG( Ok(), (GdkColor *) NULL, "invalid colour" );
- return &M_COLDATA->m_color;
+ return &M_COLDATA->m_color;
}
int wxFont::GetPointSize() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid font" );
- return 0;
- }
+ wxCHECK_MSG( Ok(), 0, "invalid font" );
return M_FONTDATA->m_pointSize;
}
wxString wxFont::GetFaceString() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid font" );
- return "";
- }
+ wxCHECK_MSG( Ok(), "", "invalid font" );
wxString s = wxTheFontNameDirectory->GetFontName( M_FONTDATA->m_fontId );
return s;
wxString wxFont::GetFaceName() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid font" );
- return "";
- }
+ wxCHECK_MSG( Ok(), "", "invalid font" );
wxString s = wxTheFontNameDirectory->GetFontName( M_FONTDATA->m_fontId );
return s;
int wxFont::GetFamily() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid font" );
- return 0;
- }
+ wxCHECK_MSG( Ok(), 0, "invalid font" );
return M_FONTDATA->m_family;
}
wxString wxFont::GetFamilyString() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid font" );
- return "wxDEFAULT";
- }
+ wxCHECK_MSG( Ok(), "wxDEFAULT", "invalid font" );
switch (M_FONTDATA->m_family)
{
int wxFont::GetFontId() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid font" );
- return 0;
- }
+ wxCHECK_MSG( Ok(), 0, "invalid font" );
return M_FONTDATA->m_fontId; // stub
}
int wxFont::GetStyle() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid font" );
- return 0;
- }
+ wxCHECK_MSG( Ok(), 0, "invalid font" );
return M_FONTDATA->m_style;
}
wxString wxFont::GetStyleString() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid font" );
- return "wxDEFAULT";
- }
+ wxCHECK_MSG( Ok(), "wxDEFAULT", "invalid font" );
switch (M_FONTDATA->m_style)
{
int wxFont::GetWeight() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid font" );
- return 0;
- }
+ wxCHECK_MSG( Ok(), 0, "invalid font" );
return M_FONTDATA->m_weight;
}
wxString wxFont::GetWeightString() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid font" );
- return "wxDEFAULT";
- }
+ wxCHECK_MSG( Ok(), "wxDEFAULT", "invalid font" );
switch (M_FONTDATA->m_weight)
{
bool wxFont::GetUnderlined() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid font" );
- return FALSE;
- }
+ wxCHECK_MSG( Ok(), FALSE, "invalid font" );
return M_FONTDATA->m_underlined;
}
wxScrollBar *win )
{
win->m_isScrolling = TRUE;
- g_blockEventsOnScroll = TRUE;
+// g_blockEventsOnScroll = TRUE; doesn't work in DialogEd
return FALSE;
}
wxScrollBar *win )
{
win->m_isScrolling = FALSE;
- g_blockEventsOnScroll = FALSE;
+// g_blockEventsOnScroll = FALSE;
gtk_signal_emit_by_name( GTK_OBJECT(win->m_adjust), "value_changed" );
#endif
#include "wx/settings.h"
+#include "wx/debug.h"
/*
#define wxSYS_COLOUR_SCROLLBAR 0
wxFont *g_systemFont = (wxFont *) NULL;
-void wxSystemSettings::Done() {
- wxDELETE(g_systemBtnFaceColour);
- wxDELETE(g_systemBtnShadowColour);
- wxDELETE(g_systemBtnHighlightColour);
- wxDELETE(g_systemHighlightColour);
- wxDELETE(g_systemFont);
+void wxSystemSettings::Done()
+{
+ wxDELETE(g_systemBtnFaceColour);
+ wxDELETE(g_systemBtnShadowColour);
+ wxDELETE(g_systemBtnHighlightColour);
+ wxDELETE(g_systemHighlightColour);
+ wxDELETE(g_systemFont);
}
wxColour wxSystemSettings::GetSystemColour( int index )
int wxSystemSettings::GetSystemMetric( int index )
{
- switch (index)
- {
- case wxSYS_SCREEN_X:
- return gdk_screen_width();
- case wxSYS_SCREEN_Y:
- return gdk_screen_height();
- }
- return 0;
+ switch (index)
+ {
+ case wxSYS_SCREEN_X: return gdk_screen_width();
+ case wxSYS_SCREEN_Y: return gdk_screen_height();
+ case wxSYS_HSCROLL_Y: return 15;
+ case wxSYS_VSCROLL_X: return 15;
+ }
+
+ wxCHECK_MSG( index, 0, "wxSystemSettings::GetSystemMetric not fully implemented" );
+
+ return 0;
}
const wxPoint &pos, const wxSize &size,
long style, const wxString &name )
{
- Create( parent, id, label, pos, size, style, name );
+ Create( parent, id, label, pos, size, style, name );
}
bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos, const wxSize &size,
long style, const wxString &name )
{
- m_needParent = TRUE;
+ m_needParent = TRUE;
- PreCreation( parent, id, pos, size, style, name );
+ PreCreation( parent, id, pos, size, style, name );
- m_widget = gtk_frame_new(m_label);
+ m_isStaticBox = TRUE;
+
+ m_widget = gtk_frame_new(m_label);
- m_parent->AddChild( this );
+ m_parent->AddChild( this );
- (m_parent->m_insertCallback)( m_parent, this );
+ (m_parent->m_insertCallback)( m_parent, this );
- PostCreation();
+ PostCreation();
- SetLabel(label);
+ SetLabel(label);
- SetBackgroundColour( parent->GetBackgroundColour() );
- SetForegroundColour( parent->GetForegroundColour() );
+ SetBackgroundColour( parent->GetBackgroundColour() );
+ SetForegroundColour( parent->GetForegroundColour() );
- Show( TRUE );
+ Show( TRUE );
- return TRUE;
+ return TRUE;
}
void wxStaticBox::SetLabel( const wxString &label )
{
- wxControl::SetLabel( label );
- GtkFrame *frame = GTK_FRAME( m_widget );
- gtk_frame_set_label( frame, GetLabel() );
+ wxControl::SetLabel( label );
+ GtkFrame *frame = GTK_FRAME( m_widget );
+ gtk_frame_set_label( frame, GetLabel() );
}
void wxStaticBox::ApplyWidgetStyle()
{
- SetWidgetStyle();
- gtk_widget_set_style( m_widget, m_widgetStyle );
+ SetWidgetStyle();
+ gtk_widget_set_style( m_widget, m_widgetStyle );
}
while (node)
{
wxWindow *child = (wxWindow*)node->Data();
- if ((child->m_wxwindow == (GtkWidget*) NULL) &&
- (child->m_x <= event.m_x) &&
- (child->m_y <= event.m_y) &&
- (child->m_x+child->m_width >= event.m_x) &&
- (child->m_y+child->m_height >= event.m_y))
- {
- win = child;
- event.m_x -= child->m_x;
- event.m_y -= child->m_y;
- break;
+
+ if (child->m_isStaticBox)
+ {
+ // wxStaticBox is transparent in the box itself
+ int x = event.m_x;
+ int y = event.m_y;
+ int xx1 = child->m_x;
+ int yy1 = child->m_y;
+ int xx2 = child->m_x + child->m_width;
+ int yy2 = child->m_x + child->m_height;
+
+ // left
+ if (((x >= xx1) && (x <= xx1+10) && (y >= yy1) && (y <= yy2)) ||
+ // right
+ ((x >= xx2-10) && (x <= xx2) && (y >= yy1) && (y <= yy2)) ||
+ // top
+ ((x >= xx1) && (x <= xx2) && (y >= yy1) && (y <= yy1+10)) ||
+ // bottom
+ ((x >= xx1) && (x <= xx2) && (y >= yy2-1) && (y <= yy2)))
+ {
+ win = child;
+ event.m_x -= child->m_x;
+ event.m_y -= child->m_y;
+ break;
+ }
+
+ }
+ else
+ {
+ if ((child->m_wxwindow == (GtkWidget*) NULL) &&
+ (child->m_x <= event.m_x) &&
+ (child->m_y <= event.m_y) &&
+ (child->m_x+child->m_width >= event.m_x) &&
+ (child->m_y+child->m_height >= event.m_y))
+ {
+ win = child;
+ event.m_x -= child->m_x;
+ event.m_y -= child->m_y;
+ break;
+ }
}
node = node->Next();
}
while (node)
{
wxWindow *child = (wxWindow*)node->Data();
- if ((child->m_wxwindow == (GtkWidget*) NULL) &&
- (child->m_x <= event.m_x) &&
- (child->m_y <= event.m_y) &&
- (child->m_x+child->m_width >= event.m_x) &&
- (child->m_y+child->m_height >= event.m_y))
- {
- win = child;
- event.m_x -= child->m_x;
- event.m_y -= child->m_y;
- break;
+
+ if (child->m_isStaticBox)
+ {
+ // wxStaticBox is transparent in the box itself
+ int x = event.m_x;
+ int y = event.m_y;
+ int xx1 = child->m_x;
+ int yy1 = child->m_y;
+ int xx2 = child->m_x + child->m_width;
+ int yy2 = child->m_x + child->m_height;
+
+ // left
+ if (((x >= xx1) && (x <= xx1+10) && (y >= yy1) && (y <= yy2)) ||
+ // right
+ ((x >= xx2-10) && (x <= xx2) && (y >= yy1) && (y <= yy2)) ||
+ // top
+ ((x >= xx1) && (x <= xx2) && (y >= yy1) && (y <= yy1+10)) ||
+ // bottom
+ ((x >= xx1) && (x <= xx2) && (y >= yy2-1) && (y <= yy2)))
+ {
+ win = child;
+ event.m_x -= child->m_x;
+ event.m_y -= child->m_y;
+ break;
+ }
+
+ }
+ else
+ {
+ if ((child->m_wxwindow == (GtkWidget*) NULL) &&
+ (child->m_x <= event.m_x) &&
+ (child->m_y <= event.m_y) &&
+ (child->m_x+child->m_width >= event.m_x) &&
+ (child->m_y+child->m_height >= event.m_y))
+ {
+ win = child;
+ event.m_x -= child->m_x;
+ event.m_y -= child->m_y;
+ break;
+ }
}
node = node->Next();
}
while (node)
{
wxWindow *child = (wxWindow*)node->Data();
- if ((child->m_wxwindow == (GtkWidget*) NULL) &&
- (child->m_x <= event.m_x) &&
- (child->m_y <= event.m_y) &&
- (child->m_x+child->m_width >= event.m_x) &&
- (child->m_y+child->m_height >= event.m_y))
- {
- win = child;
- event.m_x -= child->m_x;
- event.m_y -= child->m_y;
- break;
+
+ if (child->m_isStaticBox)
+ {
+ // wxStaticBox is transparent in the box itself
+ int x = event.m_x;
+ int y = event.m_y;
+ int xx1 = child->m_x;
+ int yy1 = child->m_y;
+ int xx2 = child->m_x + child->m_width;
+ int yy2 = child->m_x + child->m_height;
+
+ // left
+ if (((x >= xx1) && (x <= xx1+10) && (y >= yy1) && (y <= yy2)) ||
+ // right
+ ((x >= xx2-10) && (x <= xx2) && (y >= yy1) && (y <= yy2)) ||
+ // top
+ ((x >= xx1) && (x <= xx2) && (y >= yy1) && (y <= yy1+10)) ||
+ // bottom
+ ((x >= xx1) && (x <= xx2) && (y >= yy2-1) && (y <= yy2)))
+ {
+ win = child;
+ event.m_x -= child->m_x;
+ event.m_y -= child->m_y;
+ break;
+ }
+
+ }
+ else
+ {
+ if ((child->m_wxwindow == (GtkWidget*) NULL) &&
+ (child->m_x <= event.m_x) &&
+ (child->m_y <= event.m_y) &&
+ (child->m_x+child->m_width >= event.m_x) &&
+ (child->m_y+child->m_height >= event.m_y))
+ {
+ win = child;
+ event.m_x -= child->m_x;
+ event.m_y -= child->m_y;
+ break;
+ }
}
node = node->Next();
}
GdkEventButton *WXUNUSED(gdk_event),
wxWindow *win )
{
+// don't test here as we can release the mouse while being over
+// a different window then the slider
+//
// if (gdk_event->window != widget->slider) return FALSE;
win->m_isScrolling = TRUE;
wxWindow *win )
{
-// don't test here as we can reelase the mouse while being over
+// don't test here as we can release the mouse while being over
// a different window then the slider
//
// if (gdk_event->window != widget->slider) return FALSE;
// C++ has no virtual methods in a constructor. We have to emulate a
// virtual function here as wxNotebook requires a different way to insert
// a child in it. I had opted for creating a wxNotebookPage window class
-// which would have made this superflouus (such in the MDI window system),
-// but no-one is listening to me...
+// which would have made this superfluous (such in the MDI window system),
+// but no-one was listening to me...
static void wxInsertChildInWindow( wxWindow* parent, wxWindow* child )
{
m_clientObject = (wxClientData*) NULL;
m_clientData = NULL;
+
+ m_isStaticBox = FALSE;
}
wxWindow::wxWindow( wxWindow *parent, wxWindowID id,
m_cursor = new wxCursor( wxCURSOR_ARROW );
m_font = *wxSWISS_FONT;
-// m_backgroundColour = wxWHITE;
-// m_foregroundColour = wxBLACK;
+ m_backgroundColour = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
+ m_foregroundColour = *wxBLACK;
m_windowStyle = style;
m_windowName = name;
m_clientObject = (wxClientData*)NULL;
m_clientData = NULL;
+
+ m_isStaticBox = FALSE;
}
void wxWindow::PostCreation()
void wxWindow::GetSize( int *width, int *height ) const
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_RET( (m_widget != NULL), "invalid window" );
if (width) (*width) = m_width;
if (height) (*height) = m_height;
void wxWindow::SetClientSize( int width, int height )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
-
- if (!m_wxwindow)
- {
- SetSize( width, height );
- }
- else
- {
- int dw = 0;
- int dh = 0;
+ wxCHECK_RET( (m_widget != NULL), "invalid window" );
- if (!m_hasScrolling)
+ if (!m_wxwindow)
{
- GtkStyleClass *window_class = m_wxwindow->style->klass;
-
- if ((m_windowStyle & wxRAISED_BORDER) ||
- (m_windowStyle & wxSUNKEN_BORDER))
- {
- dw += 2 * window_class->xthickness;
- dh += 2 * window_class->ythickness;
- }
+ SetSize( width, height );
}
else
{
- GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
- GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
+ int dw = 0;
+ int dh = 0;
+
+ if (!m_hasScrolling)
+ {
+ GtkStyleClass *window_class = m_wxwindow->style->klass;
+
+ if ((m_windowStyle & wxRAISED_BORDER) ||
+ (m_windowStyle & wxSUNKEN_BORDER))
+ {
+ dw += 2 * window_class->xthickness;
+ dh += 2 * window_class->ythickness;
+ }
+ }
+ else
+ {
+ GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
+ GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
#ifdef NEW_GTK_SCROLL_CODE
- GtkWidget *viewport = scroll_window->child;
+ GtkWidget *viewport = scroll_window->child;
#else
- GtkWidget *viewport = scroll_window->viewport;
+ GtkWidget *viewport = scroll_window->viewport;
#endif
- GtkStyleClass *viewport_class = viewport->style->klass;
+ GtkStyleClass *viewport_class = viewport->style->klass;
- GtkWidget *hscrollbar = scroll_window->hscrollbar;
- GtkWidget *vscrollbar = scroll_window->vscrollbar;
+ GtkWidget *hscrollbar = scroll_window->hscrollbar;
+ GtkWidget *vscrollbar = scroll_window->vscrollbar;
- if ((m_windowStyle & wxRAISED_BORDER) ||
- (m_windowStyle & wxSUNKEN_BORDER))
- {
- dw += 2 * viewport_class->xthickness;
- dh += 2 * viewport_class->ythickness;
- }
+ if ((m_windowStyle & wxRAISED_BORDER) ||
+ (m_windowStyle & wxSUNKEN_BORDER))
+ {
+ dw += 2 * viewport_class->xthickness;
+ dh += 2 * viewport_class->ythickness;
+ }
- if (scroll_window->vscrollbar_visible)
- {
- dw += vscrollbar->allocation.width;
- dw += scroll_class->scrollbar_spacing;
- }
+ if (scroll_window->vscrollbar_visible)
+ {
+ dw += vscrollbar->allocation.width;
+ dw += scroll_class->scrollbar_spacing;
+ }
- if (scroll_window->hscrollbar_visible)
- {
- dh += hscrollbar->allocation.height;
- dw += scroll_class->scrollbar_spacing;
- }
- }
+ if (scroll_window->hscrollbar_visible)
+ {
+ dh += hscrollbar->allocation.height;
+ dw += scroll_class->scrollbar_spacing;
+ }
+ }
- SetSize( width+dw, height+dh );
- }
+ SetSize( width+dw, height+dh );
+ }
}
void wxWindow::GetClientSize( int *width, int *height ) const
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
-
- if (!m_wxwindow)
- {
- if (width) (*width) = m_width;
- if (height) (*height) = m_height;
- }
- else
- {
- int dw = 0;
- int dh = 0;
+ wxCHECK_RET( (m_widget != NULL), "invalid window" );
- if (!m_hasScrolling)
+ if (!m_wxwindow)
{
- GtkStyleClass *window_class = m_wxwindow->style->klass;
-
- if ((m_windowStyle & wxRAISED_BORDER) ||
- (m_windowStyle & wxSUNKEN_BORDER))
- {
- dw += 2 * window_class->xthickness;
- dh += 2 * window_class->ythickness;
- }
+ if (width) (*width) = m_width;
+ if (height) (*height) = m_height;
}
else
{
- GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
- GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
+ int dw = 0;
+ int dh = 0;
+
+ if (!m_hasScrolling)
+ {
+ GtkStyleClass *window_class = m_wxwindow->style->klass;
+
+ if ((m_windowStyle & wxRAISED_BORDER) ||
+ (m_windowStyle & wxSUNKEN_BORDER))
+ {
+ dw += 2 * window_class->xthickness;
+ dh += 2 * window_class->ythickness;
+ }
+ }
+ else
+ {
+ GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
+ GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
#ifdef NEW_GTK_SCROLL_CODE
- GtkWidget *viewport = scroll_window->child;
+ GtkWidget *viewport = scroll_window->child;
#else
- GtkWidget *viewport = scroll_window->viewport;
+ GtkWidget *viewport = scroll_window->viewport;
#endif
- GtkStyleClass *viewport_class = viewport->style->klass;
+ GtkStyleClass *viewport_class = viewport->style->klass;
- if ((m_windowStyle & wxRAISED_BORDER) ||
- (m_windowStyle & wxSUNKEN_BORDER))
- {
- dw += 2 * viewport_class->xthickness;
- dh += 2 * viewport_class->ythickness;
- }
+ if ((m_windowStyle & wxRAISED_BORDER) ||
+ (m_windowStyle & wxSUNKEN_BORDER))
+ {
+ dw += 2 * viewport_class->xthickness;
+ dh += 2 * viewport_class->ythickness;
+ }
- if (scroll_window->vscrollbar_visible)
- {
-// dw += vscrollbar->allocation.width;
- dw += 15; // range.slider_width = 11 + 2*2pts edge
- dw += scroll_class->scrollbar_spacing;
- }
+ if (scroll_window->vscrollbar_visible)
+ {
+// dw += vscrollbar->allocation.width;
+ dw += 15; // range.slider_width = 11 + 2*2pts edge
+ dw += scroll_class->scrollbar_spacing;
+ }
- if (scroll_window->hscrollbar_visible)
- {
-// dh += hscrollbar->allocation.height;
- dh += 15;
- dh += scroll_class->scrollbar_spacing;
- }
- }
+ if (scroll_window->hscrollbar_visible)
+ {
+// dh += hscrollbar->allocation.height;
+ dh += 15;
+ dh += scroll_class->scrollbar_spacing;
+ }
+ }
- if (width) (*width) = m_width - dw;
- if (height) (*height) = m_height - dh;
- }
+ if (width) (*width) = m_width - dw;
+ if (height) (*height) = m_height - dh;
+ }
}
void wxWindow::GetPosition( int *x, int *y ) const
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_RET( (m_widget != NULL), "invalid window" );
if (x) (*x) = m_x;
if (y) (*y) = m_y;
void wxWindow::ClientToScreen( int *x, int *y )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_RET( (m_widget != NULL), "invalid window" );
GdkWindow *source = (GdkWindow *) NULL;
if (m_wxwindow)
void wxWindow::ScreenToClient( int *x, int *y )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_RET( (m_widget != NULL), "invalid window" );
- GdkWindow *source = (GdkWindow *) NULL;
- if (m_wxwindow)
- source = m_wxwindow->window;
- else
- source = m_widget->window;
+ GdkWindow *source = (GdkWindow *) NULL;
+ if (m_wxwindow)
+ source = m_wxwindow->window;
+ else
+ source = m_widget->window;
- int org_x = 0;
- int org_y = 0;
- gdk_window_get_origin( source, &org_x, &org_y );
+ int org_x = 0;
+ int org_y = 0;
+ gdk_window_get_origin( source, &org_x, &org_y );
- if (!m_wxwindow)
- {
- if (GTK_WIDGET_NO_WINDOW (m_widget))
+ if (!m_wxwindow)
{
- org_x += m_widget->allocation.x;
- org_y += m_widget->allocation.y;
+ if (GTK_WIDGET_NO_WINDOW (m_widget))
+ {
+ org_x += m_widget->allocation.x;
+ org_y += m_widget->allocation.y;
+ }
}
- }
- wxPoint pt(GetClientAreaOrigin());
- org_x -= pt.x;
- org_y -= pt.y;
+ wxPoint pt(GetClientAreaOrigin());
+ org_x -= pt.x;
+ org_y -= pt.y;
- if (x) *x -= org_x;
- if (y) *y -= org_y;
+ if (x) *x -= org_x;
+ if (y) *y -= org_y;
}
void wxWindow::Centre( int direction )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_RET( (m_widget != NULL), "invalid window" );
- int x = m_x;
- int y = m_y;
+ int x = m_x;
+ int y = m_y;
- if (m_parent)
- {
- int p_w = 0;
- int p_h = 0;
- m_parent->GetSize( &p_w, &p_h );
- if (direction & wxHORIZONTAL == wxHORIZONTAL) x = (p_w - m_width) / 2;
- if (direction & wxVERTICAL == wxVERTICAL) y = (p_h - m_height) / 2;
- }
- else
- {
- if (direction & wxHORIZONTAL == wxHORIZONTAL) x = (gdk_screen_width () - m_width) / 2;
- if (direction & wxVERTICAL == wxVERTICAL) y = (gdk_screen_height () - m_height) / 2;
- }
+ if (m_parent)
+ {
+ int p_w = 0;
+ int p_h = 0;
+ m_parent->GetSize( &p_w, &p_h );
+ if (direction & wxHORIZONTAL == wxHORIZONTAL) x = (p_w - m_width) / 2;
+ if (direction & wxVERTICAL == wxVERTICAL) y = (p_h - m_height) / 2;
+ }
+ else
+ {
+ if (direction & wxHORIZONTAL == wxHORIZONTAL) x = (gdk_screen_width () - m_width) / 2;
+ if (direction & wxVERTICAL == wxVERTICAL) y = (gdk_screen_height () - m_height) / 2;
+ }
- Move( x, y );
+ Move( x, y );
}
void wxWindow::Fit()
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
-
- int maxX = 0;
- int maxY = 0;
- wxNode *node = m_children.First();
- while ( node )
- {
- wxWindow *win = (wxWindow *)node->Data();
- int wx, wy, ww, wh;
- win->GetPosition(&wx, &wy);
- win->GetSize(&ww, &wh);
- if ( wx + ww > maxX )
- maxX = wx + ww;
- if ( wy + wh > maxY )
- maxY = wy + wh;
+ wxCHECK_RET( (m_widget != NULL), "invalid window" );
- node = node->Next();
- }
- SetClientSize(maxX + 5, maxY + 10);
+ int maxX = 0;
+ int maxY = 0;
+ wxNode *node = m_children.First();
+ while (node)
+ {
+ wxWindow *win = (wxWindow *)node->Data();
+ int wx, wy, ww, wh;
+ win->GetPosition(&wx, &wy);
+ win->GetSize(&ww, &wh);
+ if (wx + ww > maxX) maxX = wx + ww;
+ if (wy + wh > maxY) maxY = wy + wh;
+
+ node = node->Next();
+ }
+
+ SetClientSize(maxX + 7, maxY + 14);
}
void wxWindow::SetSizeHints( int minW, int minH, int maxW, int maxH, int WXUNUSED(incW), int WXUNUSED(incH) )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_RET( (m_widget != NULL), "invalid window" );
- m_minWidth = minW;
- m_minHeight = minH;
- m_maxWidth = maxW;
- m_maxHeight = maxH;
+ m_minWidth = minW;
+ m_minHeight = minH;
+ m_maxWidth = maxW;
+ m_maxHeight = maxH;
}
void wxWindow::OnSize( wxSizeEvent &WXUNUSED(event) )
bool wxWindow::Show( bool show )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_MSG( (m_widget != NULL), FALSE, "invalid window" );
- if (show)
- gtk_widget_show( m_widget );
- else
- gtk_widget_hide( m_widget );
- m_isShown = show;
- return TRUE;
+ if (show)
+ gtk_widget_show( m_widget );
+ else
+ gtk_widget_hide( m_widget );
+
+ m_isShown = show;
+
+ return TRUE;
}
void wxWindow::Enable( bool enable )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_RET( (m_widget != NULL), "invalid window" );
- m_isEnabled = enable;
- gtk_widget_set_sensitive( m_widget, enable );
- if (m_wxwindow) gtk_widget_set_sensitive( m_wxwindow, enable );
+ m_isEnabled = enable;
+
+ gtk_widget_set_sensitive( m_widget, enable );
+ if (m_wxwindow) gtk_widget_set_sensitive( m_wxwindow, enable );
}
int wxWindow::GetCharHeight() const
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_MSG( (m_widget != NULL), 12, "invalid window" );
- if (!m_font.Ok())
- {
- wxFAIL_MSG( "invalid font" );
- return -1;
- }
+ wxCHECK_MSG( m_font.Ok(), 12, "invalid font" );
- GdkFont *font = m_font.GetInternalFont( 1.0 );
- return font->ascent + font->descent;
+ GdkFont *font = m_font.GetInternalFont( 1.0 );
+
+ return font->ascent + font->descent;
}
int wxWindow::GetCharWidth() const
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_MSG( (m_widget != NULL), 8, "invalid window" );
- if (!m_font.Ok())
- {
- wxFAIL_MSG( "invalid font" );
- return -1;
- }
+ wxCHECK_MSG( m_font.Ok(), 8, "invalid font" );
GdkFont *font = m_font.GetInternalFont( 1.0 );
+
return gdk_string_width( font, "H" );
}
void wxWindow::GetTextExtent( const wxString& string, int *x, int *y,
int *descent, int *externalLeading, const wxFont *theFont, bool WXUNUSED(use16) ) const
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
-
wxFont fontToUse = m_font;
if (theFont) fontToUse = *theFont;
- if (!fontToUse.Ok())
- {
- wxFAIL_MSG( "invalid font" );
- return;
- }
- wxASSERT_MSG( (m_font.Ok()), "invalid font" );
+ wxCHECK_RET( fontToUse.Ok(), "invalid font" );
GdkFont *font = fontToUse.GetInternalFont( 1.0 );
if (x) (*x) = gdk_string_width( font, string );
void wxWindow::MakeModal( bool modal )
{
- return;
- // Disable all other windows
- if (this->IsKindOf(CLASSINFO(wxDialog)) || this->IsKindOf(CLASSINFO(wxFrame)))
- {
- wxNode *node = wxTopLevelWindows.First();
- while (node)
+ return;
+
+ // Disable all other windows
+ if (this->IsKindOf(CLASSINFO(wxDialog)) || this->IsKindOf(CLASSINFO(wxFrame)))
{
- wxWindow *win = (wxWindow *)node->Data();
- if (win != this)
- win->Enable(!modal);
+ wxNode *node = wxTopLevelWindows.First();
+ while (node)
+ {
+ wxWindow *win = (wxWindow *)node->Data();
+ if (win != this) win->Enable(!modal);
- node = node->Next();
+ node = node->Next();
+ }
}
- }
}
void wxWindow::SetFocus()
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_RET( (m_widget != NULL), "invalid window" );
GtkWidget *connect_widget = GetConnectWidget();
if (connect_widget)
void wxWindow::AddChild( wxWindow *child )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
- wxASSERT_MSG( (child != NULL), "invalid child" );
+ wxCHECK_RET( (m_widget != NULL), "invalid window" );
+ wxCHECK_RET( (child != NULL), "invalid child" );
m_children.Append( child );
}
wxWindow *wxWindow::ReParent( wxWindow *newParent )
{
- wxWindow *oldParent = GetParent();
+ wxCHECK_MSG( (m_widget != NULL), (wxWindow*) NULL, "invalid window" );
+
+ wxWindow *oldParent = GetParent();
- if (oldParent) oldParent->RemoveChild( this );
+ if (oldParent) oldParent->RemoveChild( this );
- gtk_widget_unparent( m_widget );
+ gtk_widget_unparent( m_widget );
- if (newParent)
- {
- newParent->AddChild( this );
- (newParent->m_insertCallback)( newParent, this );
- }
+ if (newParent)
+ {
+ newParent->AddChild( this );
+ (newParent->m_insertCallback)( newParent, this );
+ }
- return oldParent;
+ return oldParent;
}
void wxWindow::RemoveChild( wxWindow *child )
void wxWindow::Raise()
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_RET( (m_widget != NULL), "invalid window" );
if (m_widget) gdk_window_raise( m_widget->window );
}
void wxWindow::Lower()
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_RET( (m_widget != NULL), "invalid window" );
if (m_widget) gdk_window_lower( m_widget->window );
}
void wxWindow::SetValidator( const wxValidator& validator )
{
- if (m_windowValidator) delete m_windowValidator;
- m_windowValidator = validator.Clone();
- if (m_windowValidator) m_windowValidator->SetWindow(this);
+ if (m_windowValidator) delete m_windowValidator;
+ m_windowValidator = validator.Clone();
+ if (m_windowValidator) m_windowValidator->SetWindow(this);
}
void wxWindow::SetClientObject( wxClientData *data )
{
- if (m_clientObject) delete m_clientObject;
- m_clientObject = data;
+ if (m_clientObject) delete m_clientObject;
+ m_clientObject = data;
}
wxClientData *wxWindow::GetClientObject()
{
- return m_clientObject;
+ return m_clientObject;
}
void wxWindow::SetClientData( void *data )
{
- m_clientData = data;
+ m_clientData = data;
}
void *wxWindow::GetClientData()
{
- return m_clientData;
+ return m_clientData;
}
bool wxWindow::IsBeingDeleted()
{
- return FALSE;
+ return FALSE;
}
void wxWindow::SetId( wxWindowID id )
{
- m_windowId = id;
+ m_windowId = id;
}
wxWindowID wxWindow::GetId() const
{
- return m_windowId;
+ return m_windowId;
}
void wxWindow::SetCursor( const wxCursor &cursor )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
-
- if (m_cursor == NULL)
- {
- wxFAIL_MSG( "wxWindow::SetCursor m_cursor == NULL" );
- m_cursor = new wxCursor( wxCURSOR_ARROW );
- }
+ wxCHECK_RET( (m_widget != NULL), "invalid window" );
- if (cursor.Ok())
- {
- if ( cursor == *m_cursor )
- return;
- *m_cursor = cursor;
- }
- else
- {
- *m_cursor = *wxSTANDARD_CURSOR;
- }
+ if (cursor.Ok())
+ {
+ if (cursor == *m_cursor) return;
+ *m_cursor = cursor;
+ }
+ else
+ {
+ *m_cursor = *wxSTANDARD_CURSOR;
+ }
- if ((m_widget) && (m_widget->window))
- gdk_window_set_cursor( m_widget->window, m_cursor->GetCursor() );
+ if ((m_widget) && (m_widget->window))
+ gdk_window_set_cursor( m_widget->window, m_cursor->GetCursor() );
- if ((m_wxwindow) && (m_wxwindow->window))
- gdk_window_set_cursor( m_wxwindow->window, m_cursor->GetCursor() );
+ if ((m_wxwindow) && (m_wxwindow->window))
+ gdk_window_set_cursor( m_wxwindow->window, m_cursor->GetCursor() );
}
void wxWindow::Refresh( bool eraseBackground, const wxRect *rect )
}
else
{
- Clear();
+ Clear();
}
}
bool wxWindow::IsExposed( int x, int y) const
{
- return (m_updateRegion.Contains( x, y ) != wxOutRegion );
+ return (m_updateRegion.Contains( x, y ) != wxOutRegion );
}
bool wxWindow::IsExposed( int x, int y, int w, int h ) const
{
- return (m_updateRegion.Contains( x, y, w, h ) != wxOutRegion );
+ return (m_updateRegion.Contains( x, y, w, h ) != wxOutRegion );
}
bool wxWindow::IsExposed( const wxPoint& pt ) const
{
- return (m_updateRegion.Contains( pt.x, pt.y ) != wxOutRegion );
+ return (m_updateRegion.Contains( pt.x, pt.y ) != wxOutRegion );
}
bool wxWindow::IsExposed( const wxRect& rect ) const
{
- return (m_updateRegion.Contains( rect.x, rect.y, rect.width, rect.height ) != wxOutRegion );
+ return (m_updateRegion.Contains( rect.x, rect.y, rect.width, rect.height ) != wxOutRegion );
}
void wxWindow::Clear()
if (m_backgroundColour == colour) return;
- if (!m_backgroundColour.Ok())
- if (wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE ) == colour) return;
+ wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
+ if (sysbg.Red() == colour.Red() &&
+ sysbg.Green() == colour.Green() &&
+ sysbg.Blue() == colour.Blue())
+ {
+ return;
+ }
m_backgroundColour = colour;
if (!m_backgroundColour.Ok()) return;
GtkStyle *wxWindow::GetWidgetStyle()
{
- if (m_widgetStyle) gtk_style_unref( m_widgetStyle );
+ if (m_widgetStyle) gtk_style_unref( m_widgetStyle );
- m_widgetStyle =
- gtk_style_copy(
- gtk_widget_get_style( m_widget ) );
+ m_widgetStyle =
+ gtk_style_copy(
+ gtk_widget_get_style( m_widget ) );
- return m_widgetStyle;
+ return m_widgetStyle;
}
void wxWindow::SetWidgetStyle()
{
- GtkStyle *style = GetWidgetStyle();
+ GtkStyle *style = GetWidgetStyle();
- gdk_font_unref( style->font );
- style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) );
+ gdk_font_unref( style->font );
+ style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) );
- if (m_foregroundColour.Ok())
- {
- m_foregroundColour.CalcPixel( gdk_window_get_colormap( m_widget->window ) );
- style->fg[GTK_STATE_NORMAL] = *m_foregroundColour.GetColor();
- style->fg[GTK_STATE_PRELIGHT] = *m_foregroundColour.GetColor();
- style->fg[GTK_STATE_ACTIVE] = *m_foregroundColour.GetColor();
- }
+ if (m_foregroundColour.Ok())
+ {
+ m_foregroundColour.CalcPixel( gdk_window_get_colormap( m_widget->window ) );
+ style->fg[GTK_STATE_NORMAL] = *m_foregroundColour.GetColor();
+ style->fg[GTK_STATE_PRELIGHT] = *m_foregroundColour.GetColor();
+ style->fg[GTK_STATE_ACTIVE] = *m_foregroundColour.GetColor();
+ }
- if (m_backgroundColour.Ok())
- {
- m_backgroundColour.CalcPixel( gdk_window_get_colormap( m_widget->window ) );
- style->bg[GTK_STATE_NORMAL] = *m_backgroundColour.GetColor();
- style->base[GTK_STATE_NORMAL] = *m_backgroundColour.GetColor();
- style->bg[GTK_STATE_PRELIGHT] = *m_backgroundColour.GetColor();
- style->base[GTK_STATE_PRELIGHT] = *m_backgroundColour.GetColor();
- style->bg[GTK_STATE_ACTIVE] = *m_backgroundColour.GetColor();
- style->base[GTK_STATE_ACTIVE] = *m_backgroundColour.GetColor();
- style->bg[GTK_STATE_INSENSITIVE] = *m_backgroundColour.GetColor();
- style->base[GTK_STATE_INSENSITIVE] = *m_backgroundColour.GetColor();
- }
+ if (m_backgroundColour.Ok())
+ {
+ m_backgroundColour.CalcPixel( gdk_window_get_colormap( m_widget->window ) );
+ style->bg[GTK_STATE_NORMAL] = *m_backgroundColour.GetColor();
+ style->base[GTK_STATE_NORMAL] = *m_backgroundColour.GetColor();
+ style->bg[GTK_STATE_PRELIGHT] = *m_backgroundColour.GetColor();
+ style->base[GTK_STATE_PRELIGHT] = *m_backgroundColour.GetColor();
+ style->bg[GTK_STATE_ACTIVE] = *m_backgroundColour.GetColor();
+ style->base[GTK_STATE_ACTIVE] = *m_backgroundColour.GetColor();
+ style->bg[GTK_STATE_INSENSITIVE] = *m_backgroundColour.GetColor();
+ style->base[GTK_STATE_INSENSITIVE] = *m_backgroundColour.GetColor();
+ }
}
void wxWindow::ApplyWidgetStyle()
bool wxWindow::Validate()
{
- wxCHECK_MSG( m_widget != NULL, FALSE, "invalid window" );
+ wxCHECK_MSG( m_widget != NULL, FALSE, "invalid window" );
- wxNode *node = m_children.First();
- while (node)
- {
- wxWindow *child = (wxWindow *)node->Data();
- if (child->GetValidator() && /* child->GetValidator()->Ok() && */ !child->GetValidator()->Validate(this))
- { return FALSE; }
- node = node->Next();
- }
- return TRUE;
+ wxNode *node = m_children.First();
+ while (node)
+ {
+ wxWindow *child = (wxWindow *)node->Data();
+ if (child->GetValidator() && /* child->GetValidator()->Ok() && */ !child->GetValidator()->Validate(this))
+ {
+ return FALSE;
+ }
+ node = node->Next();
+ }
+ return TRUE;
}
bool wxWindow::TransferDataToWindow()
{
- wxCHECK_MSG( m_widget != NULL, FALSE, "invalid window" );
+ wxCHECK_MSG( m_widget != NULL, FALSE, "invalid window" );
- wxNode *node = m_children.First();
- while (node)
- {
- wxWindow *child = (wxWindow *)node->Data();
- if (child->GetValidator() && /* child->GetValidator()->Ok() && */
- !child->GetValidator()->TransferToWindow() )
+ wxNode *node = m_children.First();
+ while (node)
{
- wxMessageBox( _("Application Error"), _("Could not transfer data to window"), wxOK|wxICON_EXCLAMATION );
- return FALSE;
+ wxWindow *child = (wxWindow *)node->Data();
+ if (child->GetValidator() && /* child->GetValidator()->Ok() && */
+ !child->GetValidator()->TransferToWindow() )
+ {
+ wxMessageBox( _("Application Error"), _("Could not transfer data to window"), wxOK|wxICON_EXCLAMATION );
+ return FALSE;
+ }
+ node = node->Next();
}
- node = node->Next();
- }
- return TRUE;
+ return TRUE;
}
bool wxWindow::TransferDataFromWindow()
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_MSG( m_widget != NULL, FALSE, "invalid window" );
- wxNode *node = m_children.First();
- while (node)
- {
- wxWindow *child = (wxWindow *)node->Data();
- if ( child->GetValidator() && /* child->GetValidator()->Ok() && */ !child->GetValidator()->TransferFromWindow() )
- { return FALSE; }
- node = node->Next();
- }
- return TRUE;
+ wxNode *node = m_children.First();
+ while (node)
+ {
+ wxWindow *child = (wxWindow *)node->Data();
+ if ( child->GetValidator() && /* child->GetValidator()->Ok() && */ !child->GetValidator()->TransferFromWindow() )
+ {
+ return FALSE;
+ }
+ node = node->Next();
+ }
+ return TRUE;
}
void wxWindow::SetAcceleratorTable( const wxAcceleratorTable& accel )
{
- m_acceleratorTable = accel;
+ m_acceleratorTable = accel;
}
void wxWindow::OnInitDialog( wxInitDialogEvent &WXUNUSED(event) )
{
- TransferDataToWindow();
+ TransferDataToWindow();
}
void wxWindow::InitDialog()
{
- wxCHECK_RET( m_widget != NULL, "invalid window" );
+ wxCHECK_RET( m_widget != NULL, "invalid window" );
- wxInitDialogEvent event(GetId());
- event.SetEventObject( this );
- GetEventHandler()->ProcessEvent(event);
+ wxInitDialogEvent event(GetId());
+ event.SetEventObject( this );
+ GetEventHandler()->ProcessEvent(event);
}
static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
{
- menu->SetInvokingWindow( win );
- wxNode *node = menu->m_items.First();
- while (node)
- {
- wxMenuItem *menuitem = (wxMenuItem*)node->Data();
- if (menuitem->IsSubMenu())
- SetInvokingWindow( menuitem->GetSubMenu(), win );
- node = node->Next();
- }
+ menu->SetInvokingWindow( win );
+ wxNode *node = menu->m_items.First();
+ while (node)
+ {
+ wxMenuItem *menuitem = (wxMenuItem*)node->Data();
+ if (menuitem->IsSubMenu())
+ {
+ SetInvokingWindow( menuitem->GetSubMenu(), win );
+ }
+ node = node->Next();
+ }
}
bool wxWindow::PopupMenu( wxMenu *menu, int WXUNUSED(x), int WXUNUSED(y) )
{
- wxCHECK_MSG( m_widget != NULL, FALSE, "invalid window" );
+ wxCHECK_MSG( m_widget != NULL, FALSE, "invalid window" );
- wxCHECK_MSG( menu != NULL, FALSE, "invalid popup-menu" );
+ wxCHECK_MSG( menu != NULL, FALSE, "invalid popup-menu" );
- SetInvokingWindow( menu, this );
- gtk_menu_popup(
+ SetInvokingWindow( menu, this );
+ gtk_menu_popup(
GTK_MENU(menu->m_menu),
(GtkWidget *)NULL, // parent menu shell
(GtkWidget *)NULL, // parent menu item
0, // button used to activate it
0//gs_timeLastClick // the time of activation
);
- return TRUE;
+ return TRUE;
}
void wxWindow::SetDropTarget( wxDropTarget *dropTarget )
{
- wxCHECK_RET( m_widget != NULL, "invalid window" );
+ wxCHECK_RET( m_widget != NULL, "invalid window" );
- GtkWidget *dnd_widget = GetConnectWidget();
+ GtkWidget *dnd_widget = GetConnectWidget();
- if (m_dropTarget) m_dropTarget->UnregisterWidget( dnd_widget );
+ if (m_dropTarget) m_dropTarget->UnregisterWidget( dnd_widget );
- if (m_dropTarget) delete m_dropTarget;
- m_dropTarget = dropTarget;
+ if (m_dropTarget) delete m_dropTarget;
+ m_dropTarget = dropTarget;
- if (m_dropTarget) m_dropTarget->RegisterWidget( dnd_widget );
+ if (m_dropTarget) m_dropTarget->RegisterWidget( dnd_widget );
}
wxDropTarget *wxWindow::GetDropTarget() const
{
- return m_dropTarget;
+ return m_dropTarget;
}
GtkWidget* wxWindow::GetConnectWidget()
{
- GtkWidget *connect_widget = m_widget;
- if (m_wxwindow) connect_widget = m_wxwindow;
+ GtkWidget *connect_widget = m_widget;
+ if (m_wxwindow) connect_widget = m_wxwindow;
- return connect_widget;
+ return connect_widget;
}
bool wxWindow::IsOwnGtkWindow( GdkWindow *window )
{
- if (m_wxwindow) return (window == m_wxwindow->window);
- return (window == m_widget->window);
+ if (m_wxwindow) return (window == m_wxwindow->window);
+ return (window == m_widget->window);
}
void wxWindow::SetFont( const wxFont &font )
{
- wxCHECK_RET( m_widget != NULL, "invalid window" );
+ wxCHECK_RET( m_widget != NULL, "invalid window" );
- if (((wxFont*)&font)->Ok())
- m_font = font;
- else
- m_font = *wxSWISS_FONT;
+ if (((wxFont*)&font)->Ok())
+ m_font = font;
+ else
+ m_font = *wxSWISS_FONT;
- ApplyWidgetStyle();
+ ApplyWidgetStyle();
}
void wxWindow::SetWindowStyleFlag( long flag )
{
- m_windowStyle = flag;
+ m_windowStyle = flag;
}
long wxWindow::GetWindowStyleFlag() const
{
- return m_windowStyle;
+ return m_windowStyle;
}
void wxWindow::CaptureMouse()
{
- wxCHECK_RET( m_widget != NULL, "invalid window" );
+ wxCHECK_RET( m_widget != NULL, "invalid window" );
- wxCHECK_RET( g_capturing == FALSE, "CaptureMouse called twice" );
+ wxCHECK_RET( g_capturing == FALSE, "CaptureMouse called twice" );
- GtkWidget *connect_widget = GetConnectWidget();
- gtk_grab_add( connect_widget );
- gdk_pointer_grab ( connect_widget->window, FALSE,
- (GdkEventMask)
- (GDK_BUTTON_PRESS_MASK |
- GDK_BUTTON_RELEASE_MASK |
- GDK_POINTER_MOTION_MASK),
- (GdkWindow *) NULL, (GdkCursor *) NULL, GDK_CURRENT_TIME );
- g_capturing = TRUE;
+ GtkWidget *connect_widget = GetConnectWidget();
+ gtk_grab_add( connect_widget );
+ gdk_pointer_grab( connect_widget->window, FALSE,
+ (GdkEventMask)
+ (GDK_BUTTON_PRESS_MASK |
+ GDK_BUTTON_RELEASE_MASK |
+ GDK_POINTER_MOTION_MASK),
+ (GdkWindow *) NULL,
+ (GdkCursor *) NULL,
+ GDK_CURRENT_TIME );
+ g_capturing = TRUE;
}
void wxWindow::ReleaseMouse()
{
- wxCHECK_RET( m_widget != NULL, "invalid window" );
+ wxCHECK_RET( m_widget != NULL, "invalid window" );
- wxCHECK_RET( g_capturing == TRUE, "ReleaseMouse called twice" );
+ wxCHECK_RET( g_capturing == TRUE, "ReleaseMouse called twice" );
- GtkWidget *connect_widget = GetConnectWidget();
- gtk_grab_remove( connect_widget );
- gdk_pointer_ungrab ( GDK_CURRENT_TIME );
- g_capturing = FALSE;
+ GtkWidget *connect_widget = GetConnectWidget();
+ gtk_grab_remove( connect_widget );
+ gdk_pointer_ungrab ( GDK_CURRENT_TIME );
+ g_capturing = FALSE;
}
void wxWindow::SetTitle( const wxString &WXUNUSED(title) )
wxString wxWindow::GetTitle() const
{
- return (wxString&)m_windowName;
+ return (wxString&)m_windowName;
}
wxString wxWindow::GetLabel() const
{
- return GetTitle();
+ return GetTitle();
}
void wxWindow::SetName( const wxString &name )
{
- m_windowName = name;
+ m_windowName = name;
}
wxString wxWindow::GetName() const
{
- return (wxString&)m_windowName;
+ return (wxString&)m_windowName;
}
bool wxWindow::IsShown() const
{
- return m_isShown;
+ return m_isShown;
}
bool wxWindow::IsRetained()
{
- return FALSE;
+ return FALSE;
}
wxWindow *wxWindow::FindWindow( long id )
{
- if (id == m_windowId) return this;
- wxNode *node = m_children.First();
- while (node)
- {
- wxWindow *child = (wxWindow*)node->Data();
- wxWindow *res = child->FindWindow( id );
- if (res) return res;
- node = node->Next();
- }
- return (wxWindow *) NULL;
+ if (id == m_windowId) return this;
+ wxNode *node = m_children.First();
+ while (node)
+ {
+ wxWindow *child = (wxWindow*)node->Data();
+ wxWindow *res = child->FindWindow( id );
+ if (res) return res;
+ node = node->Next();
+ }
+ return (wxWindow *) NULL;
}
wxWindow *wxWindow::FindWindow( const wxString& name )
{
- if (name == m_windowName) return this;
- wxNode *node = m_children.First();
- while (node)
- {
- wxWindow *child = (wxWindow*)node->Data();
- wxWindow *res = child->FindWindow( name );
- if (res) return res;
- node = node->Next();
- }
- return (wxWindow *) NULL;
+ if (name == m_windowName) return this;
+ wxNode *node = m_children.First();
+ while (node)
+ {
+ wxWindow *child = (wxWindow*)node->Data();
+ wxWindow *res = child->FindWindow( name );
+ if (res) return res;
+ node = node->Next();
+ }
+ return (wxWindow *) NULL;
}
void wxWindow::SetScrollbar( int orient, int pos, int thumbVisible,
int range, bool refresh )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
-
- wxASSERT_MSG( (m_wxwindow != NULL), "window needs client area" );
-
- if (!m_wxwindow) return;
+ wxCHECK_RET( m_widget != NULL, "invalid window" );
- m_hasScrolling = TRUE;
+ wxCHECK_RET( m_wxwindow != NULL, "window needs client area for scrolling" );
- if (orient == wxHORIZONTAL)
- {
- float fpos = (float)pos;
- float frange = (float)range;
- float fthumb = (float)thumbVisible;
- if (fpos > frange-fthumb) fpos = frange-fthumb;
- if (fpos < 0.0) fpos = 0.0;
+ m_hasScrolling = TRUE;
- if ((fabs(frange-m_hAdjust->upper) < 0.2) &&
- (fabs(fthumb-m_hAdjust->page_size) < 0.2))
+ if (orient == wxHORIZONTAL)
{
- SetScrollPos( orient, pos, refresh );
- return;
- }
+ float fpos = (float)pos;
+ float frange = (float)range;
+ float fthumb = (float)thumbVisible;
+ if (fpos > frange-fthumb) fpos = frange-fthumb;
+ if (fpos < 0.0) fpos = 0.0;
+
+ if ((fabs(frange-m_hAdjust->upper) < 0.2) &&
+ (fabs(fthumb-m_hAdjust->page_size) < 0.2))
+ {
+ SetScrollPos( orient, pos, refresh );
+ return;
+ }
- m_oldHorizontalPos = fpos;
+ m_oldHorizontalPos = fpos;
- m_hAdjust->lower = 0.0;
- m_hAdjust->upper = frange;
- m_hAdjust->value = fpos;
- m_hAdjust->step_increment = 1.0;
- m_hAdjust->page_increment = (float)(wxMax(fthumb,0));
- m_hAdjust->page_size = fthumb;
- }
- else
- {
- float fpos = (float)pos;
- float frange = (float)range;
- float fthumb = (float)thumbVisible;
- if (fpos > frange-fthumb) fpos = frange-fthumb;
- if (fpos < 0.0) fpos = 0.0;
-
- if ((fabs(frange-m_vAdjust->upper) < 0.2) &&
- (fabs(fthumb-m_vAdjust->page_size) < 0.2))
- {
- SetScrollPos( orient, pos, refresh );
- return;
+ m_hAdjust->lower = 0.0;
+ m_hAdjust->upper = frange;
+ m_hAdjust->value = fpos;
+ m_hAdjust->step_increment = 1.0;
+ m_hAdjust->page_increment = (float)(wxMax(fthumb,0));
+ m_hAdjust->page_size = fthumb;
}
+ else
+ {
+ float fpos = (float)pos;
+ float frange = (float)range;
+ float fthumb = (float)thumbVisible;
+ if (fpos > frange-fthumb) fpos = frange-fthumb;
+ if (fpos < 0.0) fpos = 0.0;
+
+ if ((fabs(frange-m_vAdjust->upper) < 0.2) &&
+ (fabs(fthumb-m_vAdjust->page_size) < 0.2))
+ {
+ SetScrollPos( orient, pos, refresh );
+ return;
+ }
- m_oldVerticalPos = fpos;
+ m_oldVerticalPos = fpos;
- m_vAdjust->lower = 0.0;
- m_vAdjust->upper = frange;
- m_vAdjust->value = fpos;
- m_vAdjust->step_increment = 1.0;
- m_vAdjust->page_increment = (float)(wxMax(fthumb,0));
- m_vAdjust->page_size = fthumb;
- }
+ m_vAdjust->lower = 0.0;
+ m_vAdjust->upper = frange;
+ m_vAdjust->value = fpos;
+ m_vAdjust->step_increment = 1.0;
+ m_vAdjust->page_increment = (float)(wxMax(fthumb,0));
+ m_vAdjust->page_size = fthumb;
+ }
- if (m_wxwindow->window)
- {
- if (orient == wxHORIZONTAL)
- gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );
- else
- gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" );
+ if (m_wxwindow->window)
+ {
+ if (orient == wxHORIZONTAL)
+ gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );
+ else
+ gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" );
- gtk_widget_set_usize( m_widget, m_width, m_height );
- }
+ gtk_widget_set_usize( m_widget, m_width, m_height );
+ }
}
void wxWindow::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_RET( m_widget != NULL, "invalid window" );
- wxASSERT_MSG( (m_wxwindow != NULL), "window needs client area" );
+ wxCHECK_RET( m_wxwindow != NULL, "window needs client area for scrolling" );
- if (!m_wxwindow) return;
-
- if (orient == wxHORIZONTAL)
- {
- float fpos = (float)pos;
- if (fpos > m_hAdjust->upper - m_hAdjust->page_size) fpos = m_hAdjust->upper - m_hAdjust->page_size;
- if (fpos < 0.0) fpos = 0.0;
- m_oldHorizontalPos = fpos;
+ if (orient == wxHORIZONTAL)
+ {
+ float fpos = (float)pos;
+ if (fpos > m_hAdjust->upper - m_hAdjust->page_size) fpos = m_hAdjust->upper - m_hAdjust->page_size;
+ if (fpos < 0.0) fpos = 0.0;
+ m_oldHorizontalPos = fpos;
- if (fabs(fpos-m_hAdjust->value) < 0.2) return;
- m_hAdjust->value = fpos;
- }
- else
- {
- float fpos = (float)pos;
- if (fpos > m_vAdjust->upper - m_vAdjust->page_size) fpos = m_vAdjust->upper - m_vAdjust->page_size;
- if (fpos < 0.0) fpos = 0.0;
- m_oldVerticalPos = fpos;
+ if (fabs(fpos-m_hAdjust->value) < 0.2) return;
+ m_hAdjust->value = fpos;
+ }
+ else
+ {
+ float fpos = (float)pos;
+ if (fpos > m_vAdjust->upper - m_vAdjust->page_size) fpos = m_vAdjust->upper - m_vAdjust->page_size;
+ if (fpos < 0.0) fpos = 0.0;
+ m_oldVerticalPos = fpos;
- if (fabs(fpos-m_vAdjust->value) < 0.2) return;
- m_vAdjust->value = fpos;
- }
+ if (fabs(fpos-m_vAdjust->value) < 0.2) return;
+ m_vAdjust->value = fpos;
+ }
- if (!m_isScrolling)
- {
- if (m_wxwindow->window)
+ if (!m_isScrolling)
{
- if (orient == wxHORIZONTAL)
- gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" );
- else
- gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" );
+ if (m_wxwindow->window)
+ {
+ if (orient == wxHORIZONTAL)
+ gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" );
+ else
+ gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" );
+ }
}
- }
}
int wxWindow::GetScrollThumb( int orient ) const
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_MSG( m_widget != NULL, 0, "invalid window" );
- wxASSERT_MSG( (m_wxwindow != NULL), "window needs client area" );
+ wxCHECK_MSG( m_wxwindow != NULL, 0, "window needs client area for scrolling" );
- if (!m_wxwindow) return 0;
-
- if (orient == wxHORIZONTAL)
- return (int)(m_hAdjust->page_size+0.5);
- else
- return (int)(m_vAdjust->page_size+0.5);
+ if (orient == wxHORIZONTAL)
+ return (int)(m_hAdjust->page_size+0.5);
+ else
+ return (int)(m_vAdjust->page_size+0.5);
}
int wxWindow::GetScrollPos( int orient ) const
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
-
- wxASSERT_MSG( (m_wxwindow != NULL), "window needs client area" );
+ wxCHECK_MSG( m_widget != NULL, 0, "invalid window" );
- if (!m_wxwindow) return 0;
+ wxCHECK_MSG( m_wxwindow != NULL, 0, "window needs client area for scrolling" );
- if (orient == wxHORIZONTAL)
- return (int)(m_hAdjust->value+0.5);
- else
- return (int)(m_vAdjust->value+0.5);
+ if (orient == wxHORIZONTAL)
+ return (int)(m_hAdjust->value+0.5);
+ else
+ return (int)(m_vAdjust->value+0.5);
}
int wxWindow::GetScrollRange( int orient ) const
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_MSG( m_widget != NULL, 0, "invalid window" );
- wxASSERT_MSG( (m_wxwindow != NULL), "window needs client area" );
+ wxCHECK_MSG( m_wxwindow != NULL, 0, "window needs client area for scrolling" );
- if (!m_wxwindow) return 0;
-
- if (orient == wxHORIZONTAL)
- return (int)(m_hAdjust->upper+0.5);
- else
- return (int)(m_vAdjust->upper+0.5);
+ if (orient == wxHORIZONTAL)
+ return (int)(m_hAdjust->upper+0.5);
+ else
+ return (int)(m_vAdjust->upper+0.5);
}
void wxWindow::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
-
- wxASSERT_MSG( (m_wxwindow != NULL), "window needs client area" );
+ wxCHECK_RET( m_widget != NULL, "invalid window" );
- if (!m_wxwindow) return;
+ wxCHECK_RET( m_wxwindow != NULL, "window needs client area for scrolling" );
int cw = 0;
int ch = 0;
int h = ch - abs(dy);
if ((h < 0) || (w < 0))
{
- Refresh();
- return;
+ Refresh();
+ return;
}
int s_x = 0;
int s_y = 0;
if (!m_scrollGC)
{
- m_scrollGC = gdk_gc_new( m_wxwindow->window );
- gdk_gc_set_exposures( m_scrollGC, TRUE );
+ m_scrollGC = gdk_gc_new( m_wxwindow->window );
+ gdk_gc_set_exposures( m_scrollGC, TRUE );
}
gdk_window_copy_area( m_wxwindow->window, m_scrollGC, d_x, d_y,
- m_wxwindow->window, s_x, s_y, w, h );
+ m_wxwindow->window, s_x, s_y, w, h );
wxRect rect;
if (dx < 0) rect.x = cw+dx; else rect.x = 0;
wxColourRefData::wxColourRefData()
{
- m_color.red = 0;
- m_color.green = 0;
- m_color.blue = 0;
- m_color.pixel = 0;
- m_colormap = (GdkColormap *) NULL;
- m_hasPixel = FALSE;
+ m_color.red = 0;
+ m_color.green = 0;
+ m_color.blue = 0;
+ m_color.pixel = 0;
+ m_colormap = (GdkColormap *) NULL;
+ m_hasPixel = FALSE;
}
wxColourRefData::~wxColourRefData()
{
- FreeColour();
+ FreeColour();
}
void wxColourRefData::FreeColour()
wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue )
{
- m_refData = new wxColourRefData();
- M_COLDATA->m_color.red = ((unsigned short)red) << SHIFT;
- M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT;
- M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
- M_COLDATA->m_color.pixel = 0;
+ m_refData = new wxColourRefData();
+ M_COLDATA->m_color.red = ((unsigned short)red) << SHIFT;
+ M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT;
+ M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
+ M_COLDATA->m_color.pixel = 0;
}
void wxColour::InitFromName( const wxString &colourName )
{
- wxNode *node = (wxNode *) NULL;
- if ( (wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) )
- {
- wxColour *col = (wxColour*)node->Data();
- UnRef();
- if (col) Ref( *col );
- }
- else
- {
- m_refData = new wxColourRefData();
- if (!gdk_color_parse( colourName, &M_COLDATA->m_color ))
+ wxNode *node = (wxNode *) NULL;
+ if ( (wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) )
{
- wxFAIL_MSG( "wxColour: couldn't find colour" );
- delete m_refData;
- m_refData = (wxObjectRefData *) NULL;
+ wxColour *col = (wxColour*)node->Data();
+ UnRef();
+ if (col) Ref( *col );
+ }
+ else
+ {
+ m_refData = new wxColourRefData();
+ if (!gdk_color_parse( colourName, &M_COLDATA->m_color ))
+ {
+ wxFAIL_MSG( "wxColour: couldn't find colour" );
+ printf( "Colourname %s.\n", WXSTRINGCAST colourName );
+
+ delete m_refData;
+ m_refData = (wxObjectRefData *) NULL;
+ }
}
- }
}
wxColour::wxColour( const wxColour& col )
{
- Ref( col );
+ Ref( col );
}
wxColour::~wxColour()
wxColour& wxColour::operator = ( const wxColour& col )
{
- if (*this == col) return (*this);
- Ref( col );
- return *this;
+ if (*this == col) return (*this);
+ Ref( col );
+ return *this;
}
bool wxColour::operator == ( const wxColour& col )
{
- return m_refData == col.m_refData;
+ return m_refData == col.m_refData;
}
bool wxColour::operator != ( const wxColour& col)
{
- return m_refData != col.m_refData;
+ return m_refData != col.m_refData;
}
void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
{
- UnRef();
- m_refData = new wxColourRefData();
- M_COLDATA->m_color.red = ((unsigned short)red) << SHIFT;
- M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT;
- M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
- M_COLDATA->m_color.pixel = 0;
+ UnRef();
+ m_refData = new wxColourRefData();
+ M_COLDATA->m_color.red = ((unsigned short)red) << SHIFT;
+ M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT;
+ M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
+ M_COLDATA->m_color.pixel = 0;
}
unsigned char wxColour::Red() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid colour" );
- return 0;
- }
+ wxCHECK_MSG( Ok(), 0, "invalid colour" );
- return (unsigned char)(M_COLDATA->m_color.red >> SHIFT);
+ return (unsigned char)(M_COLDATA->m_color.red >> SHIFT);
}
unsigned char wxColour::Green() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid colour" );
- return 0;
- }
+ wxCHECK_MSG( Ok(), 0, "invalid colour" );
- return (unsigned char)(M_COLDATA->m_color.green >> SHIFT);
+ return (unsigned char)(M_COLDATA->m_color.green >> SHIFT);
}
unsigned char wxColour::Blue() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid colour" );
- return 0;
- }
+ wxCHECK_MSG( Ok(), 0, "invalid colour" );
- return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT);
+ return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT);
}
bool wxColour::Ok() const
{
- return (m_refData != NULL);
+ return (m_refData != NULL);
}
void wxColour::CalcPixel( GdkColormap *cmap )
{
- if (!Ok()) return;
+ if (!Ok()) return;
- if ((M_COLDATA->m_hasPixel) && (M_COLDATA->m_colormap == cmap)) return;
- M_COLDATA->FreeColour();
+ if ((M_COLDATA->m_hasPixel) && (M_COLDATA->m_colormap == cmap)) return;
+ M_COLDATA->FreeColour();
GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap;
if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
M_COLDATA->m_hasPixel = TRUE;
M_COLDATA->m_color.pixel = index;
}
- else
- {
- M_COLDATA->m_hasPixel = gdk_color_alloc( cmap, &M_COLDATA->m_color );
- }
+ else
+ {
+ M_COLDATA->m_hasPixel = gdk_color_alloc( cmap, &M_COLDATA->m_color );
+ }
- M_COLDATA->m_colormap = cmap;
+ M_COLDATA->m_colormap = cmap;
}
int wxColour::GetPixel() const
{
- if (!Ok()) return 0;
+ wxCHECK_MSG( Ok(), 0, "invalid colour" );
- return M_COLDATA->m_color.pixel;
+ return M_COLDATA->m_color.pixel;
}
GdkColor *wxColour::GetColor() const
{
- if (!Ok()) return (GdkColor *) NULL;
+ wxCHECK_MSG( Ok(), (GdkColor *) NULL, "invalid colour" );
- return &M_COLDATA->m_color;
+ return &M_COLDATA->m_color;
}
int wxFont::GetPointSize() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid font" );
- return 0;
- }
+ wxCHECK_MSG( Ok(), 0, "invalid font" );
return M_FONTDATA->m_pointSize;
}
wxString wxFont::GetFaceString() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid font" );
- return "";
- }
+ wxCHECK_MSG( Ok(), "", "invalid font" );
wxString s = wxTheFontNameDirectory->GetFontName( M_FONTDATA->m_fontId );
return s;
wxString wxFont::GetFaceName() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid font" );
- return "";
- }
+ wxCHECK_MSG( Ok(), "", "invalid font" );
wxString s = wxTheFontNameDirectory->GetFontName( M_FONTDATA->m_fontId );
return s;
int wxFont::GetFamily() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid font" );
- return 0;
- }
+ wxCHECK_MSG( Ok(), 0, "invalid font" );
return M_FONTDATA->m_family;
}
wxString wxFont::GetFamilyString() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid font" );
- return "wxDEFAULT";
- }
+ wxCHECK_MSG( Ok(), "wxDEFAULT", "invalid font" );
switch (M_FONTDATA->m_family)
{
int wxFont::GetFontId() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid font" );
- return 0;
- }
+ wxCHECK_MSG( Ok(), 0, "invalid font" );
return M_FONTDATA->m_fontId; // stub
}
int wxFont::GetStyle() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid font" );
- return 0;
- }
+ wxCHECK_MSG( Ok(), 0, "invalid font" );
return M_FONTDATA->m_style;
}
wxString wxFont::GetStyleString() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid font" );
- return "wxDEFAULT";
- }
+ wxCHECK_MSG( Ok(), "wxDEFAULT", "invalid font" );
switch (M_FONTDATA->m_style)
{
int wxFont::GetWeight() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid font" );
- return 0;
- }
+ wxCHECK_MSG( Ok(), 0, "invalid font" );
return M_FONTDATA->m_weight;
}
wxString wxFont::GetWeightString() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid font" );
- return "wxDEFAULT";
- }
+ wxCHECK_MSG( Ok(), "wxDEFAULT", "invalid font" );
switch (M_FONTDATA->m_weight)
{
bool wxFont::GetUnderlined() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid font" );
- return FALSE;
- }
+ wxCHECK_MSG( Ok(), FALSE, "invalid font" );
return M_FONTDATA->m_underlined;
}
wxScrollBar *win )
{
win->m_isScrolling = TRUE;
- g_blockEventsOnScroll = TRUE;
+// g_blockEventsOnScroll = TRUE; doesn't work in DialogEd
return FALSE;
}
wxScrollBar *win )
{
win->m_isScrolling = FALSE;
- g_blockEventsOnScroll = FALSE;
+// g_blockEventsOnScroll = FALSE;
gtk_signal_emit_by_name( GTK_OBJECT(win->m_adjust), "value_changed" );
#endif
#include "wx/settings.h"
+#include "wx/debug.h"
/*
#define wxSYS_COLOUR_SCROLLBAR 0
wxFont *g_systemFont = (wxFont *) NULL;
-void wxSystemSettings::Done() {
- wxDELETE(g_systemBtnFaceColour);
- wxDELETE(g_systemBtnShadowColour);
- wxDELETE(g_systemBtnHighlightColour);
- wxDELETE(g_systemHighlightColour);
- wxDELETE(g_systemFont);
+void wxSystemSettings::Done()
+{
+ wxDELETE(g_systemBtnFaceColour);
+ wxDELETE(g_systemBtnShadowColour);
+ wxDELETE(g_systemBtnHighlightColour);
+ wxDELETE(g_systemHighlightColour);
+ wxDELETE(g_systemFont);
}
wxColour wxSystemSettings::GetSystemColour( int index )
int wxSystemSettings::GetSystemMetric( int index )
{
- switch (index)
- {
- case wxSYS_SCREEN_X:
- return gdk_screen_width();
- case wxSYS_SCREEN_Y:
- return gdk_screen_height();
- }
- return 0;
+ switch (index)
+ {
+ case wxSYS_SCREEN_X: return gdk_screen_width();
+ case wxSYS_SCREEN_Y: return gdk_screen_height();
+ case wxSYS_HSCROLL_Y: return 15;
+ case wxSYS_VSCROLL_X: return 15;
+ }
+
+ wxCHECK_MSG( index, 0, "wxSystemSettings::GetSystemMetric not fully implemented" );
+
+ return 0;
}
const wxPoint &pos, const wxSize &size,
long style, const wxString &name )
{
- Create( parent, id, label, pos, size, style, name );
+ Create( parent, id, label, pos, size, style, name );
}
bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label,
const wxPoint &pos, const wxSize &size,
long style, const wxString &name )
{
- m_needParent = TRUE;
+ m_needParent = TRUE;
- PreCreation( parent, id, pos, size, style, name );
+ PreCreation( parent, id, pos, size, style, name );
- m_widget = gtk_frame_new(m_label);
+ m_isStaticBox = TRUE;
+
+ m_widget = gtk_frame_new(m_label);
- m_parent->AddChild( this );
+ m_parent->AddChild( this );
- (m_parent->m_insertCallback)( m_parent, this );
+ (m_parent->m_insertCallback)( m_parent, this );
- PostCreation();
+ PostCreation();
- SetLabel(label);
+ SetLabel(label);
- SetBackgroundColour( parent->GetBackgroundColour() );
- SetForegroundColour( parent->GetForegroundColour() );
+ SetBackgroundColour( parent->GetBackgroundColour() );
+ SetForegroundColour( parent->GetForegroundColour() );
- Show( TRUE );
+ Show( TRUE );
- return TRUE;
+ return TRUE;
}
void wxStaticBox::SetLabel( const wxString &label )
{
- wxControl::SetLabel( label );
- GtkFrame *frame = GTK_FRAME( m_widget );
- gtk_frame_set_label( frame, GetLabel() );
+ wxControl::SetLabel( label );
+ GtkFrame *frame = GTK_FRAME( m_widget );
+ gtk_frame_set_label( frame, GetLabel() );
}
void wxStaticBox::ApplyWidgetStyle()
{
- SetWidgetStyle();
- gtk_widget_set_style( m_widget, m_widgetStyle );
+ SetWidgetStyle();
+ gtk_widget_set_style( m_widget, m_widgetStyle );
}
while (node)
{
wxWindow *child = (wxWindow*)node->Data();
- if ((child->m_wxwindow == (GtkWidget*) NULL) &&
- (child->m_x <= event.m_x) &&
- (child->m_y <= event.m_y) &&
- (child->m_x+child->m_width >= event.m_x) &&
- (child->m_y+child->m_height >= event.m_y))
- {
- win = child;
- event.m_x -= child->m_x;
- event.m_y -= child->m_y;
- break;
+
+ if (child->m_isStaticBox)
+ {
+ // wxStaticBox is transparent in the box itself
+ int x = event.m_x;
+ int y = event.m_y;
+ int xx1 = child->m_x;
+ int yy1 = child->m_y;
+ int xx2 = child->m_x + child->m_width;
+ int yy2 = child->m_x + child->m_height;
+
+ // left
+ if (((x >= xx1) && (x <= xx1+10) && (y >= yy1) && (y <= yy2)) ||
+ // right
+ ((x >= xx2-10) && (x <= xx2) && (y >= yy1) && (y <= yy2)) ||
+ // top
+ ((x >= xx1) && (x <= xx2) && (y >= yy1) && (y <= yy1+10)) ||
+ // bottom
+ ((x >= xx1) && (x <= xx2) && (y >= yy2-1) && (y <= yy2)))
+ {
+ win = child;
+ event.m_x -= child->m_x;
+ event.m_y -= child->m_y;
+ break;
+ }
+
+ }
+ else
+ {
+ if ((child->m_wxwindow == (GtkWidget*) NULL) &&
+ (child->m_x <= event.m_x) &&
+ (child->m_y <= event.m_y) &&
+ (child->m_x+child->m_width >= event.m_x) &&
+ (child->m_y+child->m_height >= event.m_y))
+ {
+ win = child;
+ event.m_x -= child->m_x;
+ event.m_y -= child->m_y;
+ break;
+ }
}
node = node->Next();
}
while (node)
{
wxWindow *child = (wxWindow*)node->Data();
- if ((child->m_wxwindow == (GtkWidget*) NULL) &&
- (child->m_x <= event.m_x) &&
- (child->m_y <= event.m_y) &&
- (child->m_x+child->m_width >= event.m_x) &&
- (child->m_y+child->m_height >= event.m_y))
- {
- win = child;
- event.m_x -= child->m_x;
- event.m_y -= child->m_y;
- break;
+
+ if (child->m_isStaticBox)
+ {
+ // wxStaticBox is transparent in the box itself
+ int x = event.m_x;
+ int y = event.m_y;
+ int xx1 = child->m_x;
+ int yy1 = child->m_y;
+ int xx2 = child->m_x + child->m_width;
+ int yy2 = child->m_x + child->m_height;
+
+ // left
+ if (((x >= xx1) && (x <= xx1+10) && (y >= yy1) && (y <= yy2)) ||
+ // right
+ ((x >= xx2-10) && (x <= xx2) && (y >= yy1) && (y <= yy2)) ||
+ // top
+ ((x >= xx1) && (x <= xx2) && (y >= yy1) && (y <= yy1+10)) ||
+ // bottom
+ ((x >= xx1) && (x <= xx2) && (y >= yy2-1) && (y <= yy2)))
+ {
+ win = child;
+ event.m_x -= child->m_x;
+ event.m_y -= child->m_y;
+ break;
+ }
+
+ }
+ else
+ {
+ if ((child->m_wxwindow == (GtkWidget*) NULL) &&
+ (child->m_x <= event.m_x) &&
+ (child->m_y <= event.m_y) &&
+ (child->m_x+child->m_width >= event.m_x) &&
+ (child->m_y+child->m_height >= event.m_y))
+ {
+ win = child;
+ event.m_x -= child->m_x;
+ event.m_y -= child->m_y;
+ break;
+ }
}
node = node->Next();
}
while (node)
{
wxWindow *child = (wxWindow*)node->Data();
- if ((child->m_wxwindow == (GtkWidget*) NULL) &&
- (child->m_x <= event.m_x) &&
- (child->m_y <= event.m_y) &&
- (child->m_x+child->m_width >= event.m_x) &&
- (child->m_y+child->m_height >= event.m_y))
- {
- win = child;
- event.m_x -= child->m_x;
- event.m_y -= child->m_y;
- break;
+
+ if (child->m_isStaticBox)
+ {
+ // wxStaticBox is transparent in the box itself
+ int x = event.m_x;
+ int y = event.m_y;
+ int xx1 = child->m_x;
+ int yy1 = child->m_y;
+ int xx2 = child->m_x + child->m_width;
+ int yy2 = child->m_x + child->m_height;
+
+ // left
+ if (((x >= xx1) && (x <= xx1+10) && (y >= yy1) && (y <= yy2)) ||
+ // right
+ ((x >= xx2-10) && (x <= xx2) && (y >= yy1) && (y <= yy2)) ||
+ // top
+ ((x >= xx1) && (x <= xx2) && (y >= yy1) && (y <= yy1+10)) ||
+ // bottom
+ ((x >= xx1) && (x <= xx2) && (y >= yy2-1) && (y <= yy2)))
+ {
+ win = child;
+ event.m_x -= child->m_x;
+ event.m_y -= child->m_y;
+ break;
+ }
+
+ }
+ else
+ {
+ if ((child->m_wxwindow == (GtkWidget*) NULL) &&
+ (child->m_x <= event.m_x) &&
+ (child->m_y <= event.m_y) &&
+ (child->m_x+child->m_width >= event.m_x) &&
+ (child->m_y+child->m_height >= event.m_y))
+ {
+ win = child;
+ event.m_x -= child->m_x;
+ event.m_y -= child->m_y;
+ break;
+ }
}
node = node->Next();
}
GdkEventButton *WXUNUSED(gdk_event),
wxWindow *win )
{
+// don't test here as we can release the mouse while being over
+// a different window then the slider
+//
// if (gdk_event->window != widget->slider) return FALSE;
win->m_isScrolling = TRUE;
wxWindow *win )
{
-// don't test here as we can reelase the mouse while being over
+// don't test here as we can release the mouse while being over
// a different window then the slider
//
// if (gdk_event->window != widget->slider) return FALSE;
// C++ has no virtual methods in a constructor. We have to emulate a
// virtual function here as wxNotebook requires a different way to insert
// a child in it. I had opted for creating a wxNotebookPage window class
-// which would have made this superflouus (such in the MDI window system),
-// but no-one is listening to me...
+// which would have made this superfluous (such in the MDI window system),
+// but no-one was listening to me...
static void wxInsertChildInWindow( wxWindow* parent, wxWindow* child )
{
m_clientObject = (wxClientData*) NULL;
m_clientData = NULL;
+
+ m_isStaticBox = FALSE;
}
wxWindow::wxWindow( wxWindow *parent, wxWindowID id,
m_cursor = new wxCursor( wxCURSOR_ARROW );
m_font = *wxSWISS_FONT;
-// m_backgroundColour = wxWHITE;
-// m_foregroundColour = wxBLACK;
+ m_backgroundColour = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
+ m_foregroundColour = *wxBLACK;
m_windowStyle = style;
m_windowName = name;
m_clientObject = (wxClientData*)NULL;
m_clientData = NULL;
+
+ m_isStaticBox = FALSE;
}
void wxWindow::PostCreation()
void wxWindow::GetSize( int *width, int *height ) const
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_RET( (m_widget != NULL), "invalid window" );
if (width) (*width) = m_width;
if (height) (*height) = m_height;
void wxWindow::SetClientSize( int width, int height )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
-
- if (!m_wxwindow)
- {
- SetSize( width, height );
- }
- else
- {
- int dw = 0;
- int dh = 0;
+ wxCHECK_RET( (m_widget != NULL), "invalid window" );
- if (!m_hasScrolling)
+ if (!m_wxwindow)
{
- GtkStyleClass *window_class = m_wxwindow->style->klass;
-
- if ((m_windowStyle & wxRAISED_BORDER) ||
- (m_windowStyle & wxSUNKEN_BORDER))
- {
- dw += 2 * window_class->xthickness;
- dh += 2 * window_class->ythickness;
- }
+ SetSize( width, height );
}
else
{
- GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
- GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
+ int dw = 0;
+ int dh = 0;
+
+ if (!m_hasScrolling)
+ {
+ GtkStyleClass *window_class = m_wxwindow->style->klass;
+
+ if ((m_windowStyle & wxRAISED_BORDER) ||
+ (m_windowStyle & wxSUNKEN_BORDER))
+ {
+ dw += 2 * window_class->xthickness;
+ dh += 2 * window_class->ythickness;
+ }
+ }
+ else
+ {
+ GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
+ GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
#ifdef NEW_GTK_SCROLL_CODE
- GtkWidget *viewport = scroll_window->child;
+ GtkWidget *viewport = scroll_window->child;
#else
- GtkWidget *viewport = scroll_window->viewport;
+ GtkWidget *viewport = scroll_window->viewport;
#endif
- GtkStyleClass *viewport_class = viewport->style->klass;
+ GtkStyleClass *viewport_class = viewport->style->klass;
- GtkWidget *hscrollbar = scroll_window->hscrollbar;
- GtkWidget *vscrollbar = scroll_window->vscrollbar;
+ GtkWidget *hscrollbar = scroll_window->hscrollbar;
+ GtkWidget *vscrollbar = scroll_window->vscrollbar;
- if ((m_windowStyle & wxRAISED_BORDER) ||
- (m_windowStyle & wxSUNKEN_BORDER))
- {
- dw += 2 * viewport_class->xthickness;
- dh += 2 * viewport_class->ythickness;
- }
+ if ((m_windowStyle & wxRAISED_BORDER) ||
+ (m_windowStyle & wxSUNKEN_BORDER))
+ {
+ dw += 2 * viewport_class->xthickness;
+ dh += 2 * viewport_class->ythickness;
+ }
- if (scroll_window->vscrollbar_visible)
- {
- dw += vscrollbar->allocation.width;
- dw += scroll_class->scrollbar_spacing;
- }
+ if (scroll_window->vscrollbar_visible)
+ {
+ dw += vscrollbar->allocation.width;
+ dw += scroll_class->scrollbar_spacing;
+ }
- if (scroll_window->hscrollbar_visible)
- {
- dh += hscrollbar->allocation.height;
- dw += scroll_class->scrollbar_spacing;
- }
- }
+ if (scroll_window->hscrollbar_visible)
+ {
+ dh += hscrollbar->allocation.height;
+ dw += scroll_class->scrollbar_spacing;
+ }
+ }
- SetSize( width+dw, height+dh );
- }
+ SetSize( width+dw, height+dh );
+ }
}
void wxWindow::GetClientSize( int *width, int *height ) const
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
-
- if (!m_wxwindow)
- {
- if (width) (*width) = m_width;
- if (height) (*height) = m_height;
- }
- else
- {
- int dw = 0;
- int dh = 0;
+ wxCHECK_RET( (m_widget != NULL), "invalid window" );
- if (!m_hasScrolling)
+ if (!m_wxwindow)
{
- GtkStyleClass *window_class = m_wxwindow->style->klass;
-
- if ((m_windowStyle & wxRAISED_BORDER) ||
- (m_windowStyle & wxSUNKEN_BORDER))
- {
- dw += 2 * window_class->xthickness;
- dh += 2 * window_class->ythickness;
- }
+ if (width) (*width) = m_width;
+ if (height) (*height) = m_height;
}
else
{
- GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
- GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
+ int dw = 0;
+ int dh = 0;
+
+ if (!m_hasScrolling)
+ {
+ GtkStyleClass *window_class = m_wxwindow->style->klass;
+
+ if ((m_windowStyle & wxRAISED_BORDER) ||
+ (m_windowStyle & wxSUNKEN_BORDER))
+ {
+ dw += 2 * window_class->xthickness;
+ dh += 2 * window_class->ythickness;
+ }
+ }
+ else
+ {
+ GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
+ GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
#ifdef NEW_GTK_SCROLL_CODE
- GtkWidget *viewport = scroll_window->child;
+ GtkWidget *viewport = scroll_window->child;
#else
- GtkWidget *viewport = scroll_window->viewport;
+ GtkWidget *viewport = scroll_window->viewport;
#endif
- GtkStyleClass *viewport_class = viewport->style->klass;
+ GtkStyleClass *viewport_class = viewport->style->klass;
- if ((m_windowStyle & wxRAISED_BORDER) ||
- (m_windowStyle & wxSUNKEN_BORDER))
- {
- dw += 2 * viewport_class->xthickness;
- dh += 2 * viewport_class->ythickness;
- }
+ if ((m_windowStyle & wxRAISED_BORDER) ||
+ (m_windowStyle & wxSUNKEN_BORDER))
+ {
+ dw += 2 * viewport_class->xthickness;
+ dh += 2 * viewport_class->ythickness;
+ }
- if (scroll_window->vscrollbar_visible)
- {
-// dw += vscrollbar->allocation.width;
- dw += 15; // range.slider_width = 11 + 2*2pts edge
- dw += scroll_class->scrollbar_spacing;
- }
+ if (scroll_window->vscrollbar_visible)
+ {
+// dw += vscrollbar->allocation.width;
+ dw += 15; // range.slider_width = 11 + 2*2pts edge
+ dw += scroll_class->scrollbar_spacing;
+ }
- if (scroll_window->hscrollbar_visible)
- {
-// dh += hscrollbar->allocation.height;
- dh += 15;
- dh += scroll_class->scrollbar_spacing;
- }
- }
+ if (scroll_window->hscrollbar_visible)
+ {
+// dh += hscrollbar->allocation.height;
+ dh += 15;
+ dh += scroll_class->scrollbar_spacing;
+ }
+ }
- if (width) (*width) = m_width - dw;
- if (height) (*height) = m_height - dh;
- }
+ if (width) (*width) = m_width - dw;
+ if (height) (*height) = m_height - dh;
+ }
}
void wxWindow::GetPosition( int *x, int *y ) const
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_RET( (m_widget != NULL), "invalid window" );
if (x) (*x) = m_x;
if (y) (*y) = m_y;
void wxWindow::ClientToScreen( int *x, int *y )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_RET( (m_widget != NULL), "invalid window" );
GdkWindow *source = (GdkWindow *) NULL;
if (m_wxwindow)
void wxWindow::ScreenToClient( int *x, int *y )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_RET( (m_widget != NULL), "invalid window" );
- GdkWindow *source = (GdkWindow *) NULL;
- if (m_wxwindow)
- source = m_wxwindow->window;
- else
- source = m_widget->window;
+ GdkWindow *source = (GdkWindow *) NULL;
+ if (m_wxwindow)
+ source = m_wxwindow->window;
+ else
+ source = m_widget->window;
- int org_x = 0;
- int org_y = 0;
- gdk_window_get_origin( source, &org_x, &org_y );
+ int org_x = 0;
+ int org_y = 0;
+ gdk_window_get_origin( source, &org_x, &org_y );
- if (!m_wxwindow)
- {
- if (GTK_WIDGET_NO_WINDOW (m_widget))
+ if (!m_wxwindow)
{
- org_x += m_widget->allocation.x;
- org_y += m_widget->allocation.y;
+ if (GTK_WIDGET_NO_WINDOW (m_widget))
+ {
+ org_x += m_widget->allocation.x;
+ org_y += m_widget->allocation.y;
+ }
}
- }
- wxPoint pt(GetClientAreaOrigin());
- org_x -= pt.x;
- org_y -= pt.y;
+ wxPoint pt(GetClientAreaOrigin());
+ org_x -= pt.x;
+ org_y -= pt.y;
- if (x) *x -= org_x;
- if (y) *y -= org_y;
+ if (x) *x -= org_x;
+ if (y) *y -= org_y;
}
void wxWindow::Centre( int direction )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_RET( (m_widget != NULL), "invalid window" );
- int x = m_x;
- int y = m_y;
+ int x = m_x;
+ int y = m_y;
- if (m_parent)
- {
- int p_w = 0;
- int p_h = 0;
- m_parent->GetSize( &p_w, &p_h );
- if (direction & wxHORIZONTAL == wxHORIZONTAL) x = (p_w - m_width) / 2;
- if (direction & wxVERTICAL == wxVERTICAL) y = (p_h - m_height) / 2;
- }
- else
- {
- if (direction & wxHORIZONTAL == wxHORIZONTAL) x = (gdk_screen_width () - m_width) / 2;
- if (direction & wxVERTICAL == wxVERTICAL) y = (gdk_screen_height () - m_height) / 2;
- }
+ if (m_parent)
+ {
+ int p_w = 0;
+ int p_h = 0;
+ m_parent->GetSize( &p_w, &p_h );
+ if (direction & wxHORIZONTAL == wxHORIZONTAL) x = (p_w - m_width) / 2;
+ if (direction & wxVERTICAL == wxVERTICAL) y = (p_h - m_height) / 2;
+ }
+ else
+ {
+ if (direction & wxHORIZONTAL == wxHORIZONTAL) x = (gdk_screen_width () - m_width) / 2;
+ if (direction & wxVERTICAL == wxVERTICAL) y = (gdk_screen_height () - m_height) / 2;
+ }
- Move( x, y );
+ Move( x, y );
}
void wxWindow::Fit()
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
-
- int maxX = 0;
- int maxY = 0;
- wxNode *node = m_children.First();
- while ( node )
- {
- wxWindow *win = (wxWindow *)node->Data();
- int wx, wy, ww, wh;
- win->GetPosition(&wx, &wy);
- win->GetSize(&ww, &wh);
- if ( wx + ww > maxX )
- maxX = wx + ww;
- if ( wy + wh > maxY )
- maxY = wy + wh;
+ wxCHECK_RET( (m_widget != NULL), "invalid window" );
- node = node->Next();
- }
- SetClientSize(maxX + 5, maxY + 10);
+ int maxX = 0;
+ int maxY = 0;
+ wxNode *node = m_children.First();
+ while (node)
+ {
+ wxWindow *win = (wxWindow *)node->Data();
+ int wx, wy, ww, wh;
+ win->GetPosition(&wx, &wy);
+ win->GetSize(&ww, &wh);
+ if (wx + ww > maxX) maxX = wx + ww;
+ if (wy + wh > maxY) maxY = wy + wh;
+
+ node = node->Next();
+ }
+
+ SetClientSize(maxX + 7, maxY + 14);
}
void wxWindow::SetSizeHints( int minW, int minH, int maxW, int maxH, int WXUNUSED(incW), int WXUNUSED(incH) )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_RET( (m_widget != NULL), "invalid window" );
- m_minWidth = minW;
- m_minHeight = minH;
- m_maxWidth = maxW;
- m_maxHeight = maxH;
+ m_minWidth = minW;
+ m_minHeight = minH;
+ m_maxWidth = maxW;
+ m_maxHeight = maxH;
}
void wxWindow::OnSize( wxSizeEvent &WXUNUSED(event) )
bool wxWindow::Show( bool show )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_MSG( (m_widget != NULL), FALSE, "invalid window" );
- if (show)
- gtk_widget_show( m_widget );
- else
- gtk_widget_hide( m_widget );
- m_isShown = show;
- return TRUE;
+ if (show)
+ gtk_widget_show( m_widget );
+ else
+ gtk_widget_hide( m_widget );
+
+ m_isShown = show;
+
+ return TRUE;
}
void wxWindow::Enable( bool enable )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_RET( (m_widget != NULL), "invalid window" );
- m_isEnabled = enable;
- gtk_widget_set_sensitive( m_widget, enable );
- if (m_wxwindow) gtk_widget_set_sensitive( m_wxwindow, enable );
+ m_isEnabled = enable;
+
+ gtk_widget_set_sensitive( m_widget, enable );
+ if (m_wxwindow) gtk_widget_set_sensitive( m_wxwindow, enable );
}
int wxWindow::GetCharHeight() const
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_MSG( (m_widget != NULL), 12, "invalid window" );
- if (!m_font.Ok())
- {
- wxFAIL_MSG( "invalid font" );
- return -1;
- }
+ wxCHECK_MSG( m_font.Ok(), 12, "invalid font" );
- GdkFont *font = m_font.GetInternalFont( 1.0 );
- return font->ascent + font->descent;
+ GdkFont *font = m_font.GetInternalFont( 1.0 );
+
+ return font->ascent + font->descent;
}
int wxWindow::GetCharWidth() const
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_MSG( (m_widget != NULL), 8, "invalid window" );
- if (!m_font.Ok())
- {
- wxFAIL_MSG( "invalid font" );
- return -1;
- }
+ wxCHECK_MSG( m_font.Ok(), 8, "invalid font" );
GdkFont *font = m_font.GetInternalFont( 1.0 );
+
return gdk_string_width( font, "H" );
}
void wxWindow::GetTextExtent( const wxString& string, int *x, int *y,
int *descent, int *externalLeading, const wxFont *theFont, bool WXUNUSED(use16) ) const
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
-
wxFont fontToUse = m_font;
if (theFont) fontToUse = *theFont;
- if (!fontToUse.Ok())
- {
- wxFAIL_MSG( "invalid font" );
- return;
- }
- wxASSERT_MSG( (m_font.Ok()), "invalid font" );
+ wxCHECK_RET( fontToUse.Ok(), "invalid font" );
GdkFont *font = fontToUse.GetInternalFont( 1.0 );
if (x) (*x) = gdk_string_width( font, string );
void wxWindow::MakeModal( bool modal )
{
- return;
- // Disable all other windows
- if (this->IsKindOf(CLASSINFO(wxDialog)) || this->IsKindOf(CLASSINFO(wxFrame)))
- {
- wxNode *node = wxTopLevelWindows.First();
- while (node)
+ return;
+
+ // Disable all other windows
+ if (this->IsKindOf(CLASSINFO(wxDialog)) || this->IsKindOf(CLASSINFO(wxFrame)))
{
- wxWindow *win = (wxWindow *)node->Data();
- if (win != this)
- win->Enable(!modal);
+ wxNode *node = wxTopLevelWindows.First();
+ while (node)
+ {
+ wxWindow *win = (wxWindow *)node->Data();
+ if (win != this) win->Enable(!modal);
- node = node->Next();
+ node = node->Next();
+ }
}
- }
}
void wxWindow::SetFocus()
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_RET( (m_widget != NULL), "invalid window" );
GtkWidget *connect_widget = GetConnectWidget();
if (connect_widget)
void wxWindow::AddChild( wxWindow *child )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
- wxASSERT_MSG( (child != NULL), "invalid child" );
+ wxCHECK_RET( (m_widget != NULL), "invalid window" );
+ wxCHECK_RET( (child != NULL), "invalid child" );
m_children.Append( child );
}
wxWindow *wxWindow::ReParent( wxWindow *newParent )
{
- wxWindow *oldParent = GetParent();
+ wxCHECK_MSG( (m_widget != NULL), (wxWindow*) NULL, "invalid window" );
+
+ wxWindow *oldParent = GetParent();
- if (oldParent) oldParent->RemoveChild( this );
+ if (oldParent) oldParent->RemoveChild( this );
- gtk_widget_unparent( m_widget );
+ gtk_widget_unparent( m_widget );
- if (newParent)
- {
- newParent->AddChild( this );
- (newParent->m_insertCallback)( newParent, this );
- }
+ if (newParent)
+ {
+ newParent->AddChild( this );
+ (newParent->m_insertCallback)( newParent, this );
+ }
- return oldParent;
+ return oldParent;
}
void wxWindow::RemoveChild( wxWindow *child )
void wxWindow::Raise()
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_RET( (m_widget != NULL), "invalid window" );
if (m_widget) gdk_window_raise( m_widget->window );
}
void wxWindow::Lower()
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_RET( (m_widget != NULL), "invalid window" );
if (m_widget) gdk_window_lower( m_widget->window );
}
void wxWindow::SetValidator( const wxValidator& validator )
{
- if (m_windowValidator) delete m_windowValidator;
- m_windowValidator = validator.Clone();
- if (m_windowValidator) m_windowValidator->SetWindow(this);
+ if (m_windowValidator) delete m_windowValidator;
+ m_windowValidator = validator.Clone();
+ if (m_windowValidator) m_windowValidator->SetWindow(this);
}
void wxWindow::SetClientObject( wxClientData *data )
{
- if (m_clientObject) delete m_clientObject;
- m_clientObject = data;
+ if (m_clientObject) delete m_clientObject;
+ m_clientObject = data;
}
wxClientData *wxWindow::GetClientObject()
{
- return m_clientObject;
+ return m_clientObject;
}
void wxWindow::SetClientData( void *data )
{
- m_clientData = data;
+ m_clientData = data;
}
void *wxWindow::GetClientData()
{
- return m_clientData;
+ return m_clientData;
}
bool wxWindow::IsBeingDeleted()
{
- return FALSE;
+ return FALSE;
}
void wxWindow::SetId( wxWindowID id )
{
- m_windowId = id;
+ m_windowId = id;
}
wxWindowID wxWindow::GetId() const
{
- return m_windowId;
+ return m_windowId;
}
void wxWindow::SetCursor( const wxCursor &cursor )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
-
- if (m_cursor == NULL)
- {
- wxFAIL_MSG( "wxWindow::SetCursor m_cursor == NULL" );
- m_cursor = new wxCursor( wxCURSOR_ARROW );
- }
+ wxCHECK_RET( (m_widget != NULL), "invalid window" );
- if (cursor.Ok())
- {
- if ( cursor == *m_cursor )
- return;
- *m_cursor = cursor;
- }
- else
- {
- *m_cursor = *wxSTANDARD_CURSOR;
- }
+ if (cursor.Ok())
+ {
+ if (cursor == *m_cursor) return;
+ *m_cursor = cursor;
+ }
+ else
+ {
+ *m_cursor = *wxSTANDARD_CURSOR;
+ }
- if ((m_widget) && (m_widget->window))
- gdk_window_set_cursor( m_widget->window, m_cursor->GetCursor() );
+ if ((m_widget) && (m_widget->window))
+ gdk_window_set_cursor( m_widget->window, m_cursor->GetCursor() );
- if ((m_wxwindow) && (m_wxwindow->window))
- gdk_window_set_cursor( m_wxwindow->window, m_cursor->GetCursor() );
+ if ((m_wxwindow) && (m_wxwindow->window))
+ gdk_window_set_cursor( m_wxwindow->window, m_cursor->GetCursor() );
}
void wxWindow::Refresh( bool eraseBackground, const wxRect *rect )
}
else
{
- Clear();
+ Clear();
}
}
bool wxWindow::IsExposed( int x, int y) const
{
- return (m_updateRegion.Contains( x, y ) != wxOutRegion );
+ return (m_updateRegion.Contains( x, y ) != wxOutRegion );
}
bool wxWindow::IsExposed( int x, int y, int w, int h ) const
{
- return (m_updateRegion.Contains( x, y, w, h ) != wxOutRegion );
+ return (m_updateRegion.Contains( x, y, w, h ) != wxOutRegion );
}
bool wxWindow::IsExposed( const wxPoint& pt ) const
{
- return (m_updateRegion.Contains( pt.x, pt.y ) != wxOutRegion );
+ return (m_updateRegion.Contains( pt.x, pt.y ) != wxOutRegion );
}
bool wxWindow::IsExposed( const wxRect& rect ) const
{
- return (m_updateRegion.Contains( rect.x, rect.y, rect.width, rect.height ) != wxOutRegion );
+ return (m_updateRegion.Contains( rect.x, rect.y, rect.width, rect.height ) != wxOutRegion );
}
void wxWindow::Clear()
if (m_backgroundColour == colour) return;
- if (!m_backgroundColour.Ok())
- if (wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE ) == colour) return;
+ wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
+ if (sysbg.Red() == colour.Red() &&
+ sysbg.Green() == colour.Green() &&
+ sysbg.Blue() == colour.Blue())
+ {
+ return;
+ }
m_backgroundColour = colour;
if (!m_backgroundColour.Ok()) return;
GtkStyle *wxWindow::GetWidgetStyle()
{
- if (m_widgetStyle) gtk_style_unref( m_widgetStyle );
+ if (m_widgetStyle) gtk_style_unref( m_widgetStyle );
- m_widgetStyle =
- gtk_style_copy(
- gtk_widget_get_style( m_widget ) );
+ m_widgetStyle =
+ gtk_style_copy(
+ gtk_widget_get_style( m_widget ) );
- return m_widgetStyle;
+ return m_widgetStyle;
}
void wxWindow::SetWidgetStyle()
{
- GtkStyle *style = GetWidgetStyle();
+ GtkStyle *style = GetWidgetStyle();
- gdk_font_unref( style->font );
- style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) );
+ gdk_font_unref( style->font );
+ style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) );
- if (m_foregroundColour.Ok())
- {
- m_foregroundColour.CalcPixel( gdk_window_get_colormap( m_widget->window ) );
- style->fg[GTK_STATE_NORMAL] = *m_foregroundColour.GetColor();
- style->fg[GTK_STATE_PRELIGHT] = *m_foregroundColour.GetColor();
- style->fg[GTK_STATE_ACTIVE] = *m_foregroundColour.GetColor();
- }
+ if (m_foregroundColour.Ok())
+ {
+ m_foregroundColour.CalcPixel( gdk_window_get_colormap( m_widget->window ) );
+ style->fg[GTK_STATE_NORMAL] = *m_foregroundColour.GetColor();
+ style->fg[GTK_STATE_PRELIGHT] = *m_foregroundColour.GetColor();
+ style->fg[GTK_STATE_ACTIVE] = *m_foregroundColour.GetColor();
+ }
- if (m_backgroundColour.Ok())
- {
- m_backgroundColour.CalcPixel( gdk_window_get_colormap( m_widget->window ) );
- style->bg[GTK_STATE_NORMAL] = *m_backgroundColour.GetColor();
- style->base[GTK_STATE_NORMAL] = *m_backgroundColour.GetColor();
- style->bg[GTK_STATE_PRELIGHT] = *m_backgroundColour.GetColor();
- style->base[GTK_STATE_PRELIGHT] = *m_backgroundColour.GetColor();
- style->bg[GTK_STATE_ACTIVE] = *m_backgroundColour.GetColor();
- style->base[GTK_STATE_ACTIVE] = *m_backgroundColour.GetColor();
- style->bg[GTK_STATE_INSENSITIVE] = *m_backgroundColour.GetColor();
- style->base[GTK_STATE_INSENSITIVE] = *m_backgroundColour.GetColor();
- }
+ if (m_backgroundColour.Ok())
+ {
+ m_backgroundColour.CalcPixel( gdk_window_get_colormap( m_widget->window ) );
+ style->bg[GTK_STATE_NORMAL] = *m_backgroundColour.GetColor();
+ style->base[GTK_STATE_NORMAL] = *m_backgroundColour.GetColor();
+ style->bg[GTK_STATE_PRELIGHT] = *m_backgroundColour.GetColor();
+ style->base[GTK_STATE_PRELIGHT] = *m_backgroundColour.GetColor();
+ style->bg[GTK_STATE_ACTIVE] = *m_backgroundColour.GetColor();
+ style->base[GTK_STATE_ACTIVE] = *m_backgroundColour.GetColor();
+ style->bg[GTK_STATE_INSENSITIVE] = *m_backgroundColour.GetColor();
+ style->base[GTK_STATE_INSENSITIVE] = *m_backgroundColour.GetColor();
+ }
}
void wxWindow::ApplyWidgetStyle()
bool wxWindow::Validate()
{
- wxCHECK_MSG( m_widget != NULL, FALSE, "invalid window" );
+ wxCHECK_MSG( m_widget != NULL, FALSE, "invalid window" );
- wxNode *node = m_children.First();
- while (node)
- {
- wxWindow *child = (wxWindow *)node->Data();
- if (child->GetValidator() && /* child->GetValidator()->Ok() && */ !child->GetValidator()->Validate(this))
- { return FALSE; }
- node = node->Next();
- }
- return TRUE;
+ wxNode *node = m_children.First();
+ while (node)
+ {
+ wxWindow *child = (wxWindow *)node->Data();
+ if (child->GetValidator() && /* child->GetValidator()->Ok() && */ !child->GetValidator()->Validate(this))
+ {
+ return FALSE;
+ }
+ node = node->Next();
+ }
+ return TRUE;
}
bool wxWindow::TransferDataToWindow()
{
- wxCHECK_MSG( m_widget != NULL, FALSE, "invalid window" );
+ wxCHECK_MSG( m_widget != NULL, FALSE, "invalid window" );
- wxNode *node = m_children.First();
- while (node)
- {
- wxWindow *child = (wxWindow *)node->Data();
- if (child->GetValidator() && /* child->GetValidator()->Ok() && */
- !child->GetValidator()->TransferToWindow() )
+ wxNode *node = m_children.First();
+ while (node)
{
- wxMessageBox( _("Application Error"), _("Could not transfer data to window"), wxOK|wxICON_EXCLAMATION );
- return FALSE;
+ wxWindow *child = (wxWindow *)node->Data();
+ if (child->GetValidator() && /* child->GetValidator()->Ok() && */
+ !child->GetValidator()->TransferToWindow() )
+ {
+ wxMessageBox( _("Application Error"), _("Could not transfer data to window"), wxOK|wxICON_EXCLAMATION );
+ return FALSE;
+ }
+ node = node->Next();
}
- node = node->Next();
- }
- return TRUE;
+ return TRUE;
}
bool wxWindow::TransferDataFromWindow()
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_MSG( m_widget != NULL, FALSE, "invalid window" );
- wxNode *node = m_children.First();
- while (node)
- {
- wxWindow *child = (wxWindow *)node->Data();
- if ( child->GetValidator() && /* child->GetValidator()->Ok() && */ !child->GetValidator()->TransferFromWindow() )
- { return FALSE; }
- node = node->Next();
- }
- return TRUE;
+ wxNode *node = m_children.First();
+ while (node)
+ {
+ wxWindow *child = (wxWindow *)node->Data();
+ if ( child->GetValidator() && /* child->GetValidator()->Ok() && */ !child->GetValidator()->TransferFromWindow() )
+ {
+ return FALSE;
+ }
+ node = node->Next();
+ }
+ return TRUE;
}
void wxWindow::SetAcceleratorTable( const wxAcceleratorTable& accel )
{
- m_acceleratorTable = accel;
+ m_acceleratorTable = accel;
}
void wxWindow::OnInitDialog( wxInitDialogEvent &WXUNUSED(event) )
{
- TransferDataToWindow();
+ TransferDataToWindow();
}
void wxWindow::InitDialog()
{
- wxCHECK_RET( m_widget != NULL, "invalid window" );
+ wxCHECK_RET( m_widget != NULL, "invalid window" );
- wxInitDialogEvent event(GetId());
- event.SetEventObject( this );
- GetEventHandler()->ProcessEvent(event);
+ wxInitDialogEvent event(GetId());
+ event.SetEventObject( this );
+ GetEventHandler()->ProcessEvent(event);
}
static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
{
- menu->SetInvokingWindow( win );
- wxNode *node = menu->m_items.First();
- while (node)
- {
- wxMenuItem *menuitem = (wxMenuItem*)node->Data();
- if (menuitem->IsSubMenu())
- SetInvokingWindow( menuitem->GetSubMenu(), win );
- node = node->Next();
- }
+ menu->SetInvokingWindow( win );
+ wxNode *node = menu->m_items.First();
+ while (node)
+ {
+ wxMenuItem *menuitem = (wxMenuItem*)node->Data();
+ if (menuitem->IsSubMenu())
+ {
+ SetInvokingWindow( menuitem->GetSubMenu(), win );
+ }
+ node = node->Next();
+ }
}
bool wxWindow::PopupMenu( wxMenu *menu, int WXUNUSED(x), int WXUNUSED(y) )
{
- wxCHECK_MSG( m_widget != NULL, FALSE, "invalid window" );
+ wxCHECK_MSG( m_widget != NULL, FALSE, "invalid window" );
- wxCHECK_MSG( menu != NULL, FALSE, "invalid popup-menu" );
+ wxCHECK_MSG( menu != NULL, FALSE, "invalid popup-menu" );
- SetInvokingWindow( menu, this );
- gtk_menu_popup(
+ SetInvokingWindow( menu, this );
+ gtk_menu_popup(
GTK_MENU(menu->m_menu),
(GtkWidget *)NULL, // parent menu shell
(GtkWidget *)NULL, // parent menu item
0, // button used to activate it
0//gs_timeLastClick // the time of activation
);
- return TRUE;
+ return TRUE;
}
void wxWindow::SetDropTarget( wxDropTarget *dropTarget )
{
- wxCHECK_RET( m_widget != NULL, "invalid window" );
+ wxCHECK_RET( m_widget != NULL, "invalid window" );
- GtkWidget *dnd_widget = GetConnectWidget();
+ GtkWidget *dnd_widget = GetConnectWidget();
- if (m_dropTarget) m_dropTarget->UnregisterWidget( dnd_widget );
+ if (m_dropTarget) m_dropTarget->UnregisterWidget( dnd_widget );
- if (m_dropTarget) delete m_dropTarget;
- m_dropTarget = dropTarget;
+ if (m_dropTarget) delete m_dropTarget;
+ m_dropTarget = dropTarget;
- if (m_dropTarget) m_dropTarget->RegisterWidget( dnd_widget );
+ if (m_dropTarget) m_dropTarget->RegisterWidget( dnd_widget );
}
wxDropTarget *wxWindow::GetDropTarget() const
{
- return m_dropTarget;
+ return m_dropTarget;
}
GtkWidget* wxWindow::GetConnectWidget()
{
- GtkWidget *connect_widget = m_widget;
- if (m_wxwindow) connect_widget = m_wxwindow;
+ GtkWidget *connect_widget = m_widget;
+ if (m_wxwindow) connect_widget = m_wxwindow;
- return connect_widget;
+ return connect_widget;
}
bool wxWindow::IsOwnGtkWindow( GdkWindow *window )
{
- if (m_wxwindow) return (window == m_wxwindow->window);
- return (window == m_widget->window);
+ if (m_wxwindow) return (window == m_wxwindow->window);
+ return (window == m_widget->window);
}
void wxWindow::SetFont( const wxFont &font )
{
- wxCHECK_RET( m_widget != NULL, "invalid window" );
+ wxCHECK_RET( m_widget != NULL, "invalid window" );
- if (((wxFont*)&font)->Ok())
- m_font = font;
- else
- m_font = *wxSWISS_FONT;
+ if (((wxFont*)&font)->Ok())
+ m_font = font;
+ else
+ m_font = *wxSWISS_FONT;
- ApplyWidgetStyle();
+ ApplyWidgetStyle();
}
void wxWindow::SetWindowStyleFlag( long flag )
{
- m_windowStyle = flag;
+ m_windowStyle = flag;
}
long wxWindow::GetWindowStyleFlag() const
{
- return m_windowStyle;
+ return m_windowStyle;
}
void wxWindow::CaptureMouse()
{
- wxCHECK_RET( m_widget != NULL, "invalid window" );
+ wxCHECK_RET( m_widget != NULL, "invalid window" );
- wxCHECK_RET( g_capturing == FALSE, "CaptureMouse called twice" );
+ wxCHECK_RET( g_capturing == FALSE, "CaptureMouse called twice" );
- GtkWidget *connect_widget = GetConnectWidget();
- gtk_grab_add( connect_widget );
- gdk_pointer_grab ( connect_widget->window, FALSE,
- (GdkEventMask)
- (GDK_BUTTON_PRESS_MASK |
- GDK_BUTTON_RELEASE_MASK |
- GDK_POINTER_MOTION_MASK),
- (GdkWindow *) NULL, (GdkCursor *) NULL, GDK_CURRENT_TIME );
- g_capturing = TRUE;
+ GtkWidget *connect_widget = GetConnectWidget();
+ gtk_grab_add( connect_widget );
+ gdk_pointer_grab( connect_widget->window, FALSE,
+ (GdkEventMask)
+ (GDK_BUTTON_PRESS_MASK |
+ GDK_BUTTON_RELEASE_MASK |
+ GDK_POINTER_MOTION_MASK),
+ (GdkWindow *) NULL,
+ (GdkCursor *) NULL,
+ GDK_CURRENT_TIME );
+ g_capturing = TRUE;
}
void wxWindow::ReleaseMouse()
{
- wxCHECK_RET( m_widget != NULL, "invalid window" );
+ wxCHECK_RET( m_widget != NULL, "invalid window" );
- wxCHECK_RET( g_capturing == TRUE, "ReleaseMouse called twice" );
+ wxCHECK_RET( g_capturing == TRUE, "ReleaseMouse called twice" );
- GtkWidget *connect_widget = GetConnectWidget();
- gtk_grab_remove( connect_widget );
- gdk_pointer_ungrab ( GDK_CURRENT_TIME );
- g_capturing = FALSE;
+ GtkWidget *connect_widget = GetConnectWidget();
+ gtk_grab_remove( connect_widget );
+ gdk_pointer_ungrab ( GDK_CURRENT_TIME );
+ g_capturing = FALSE;
}
void wxWindow::SetTitle( const wxString &WXUNUSED(title) )
wxString wxWindow::GetTitle() const
{
- return (wxString&)m_windowName;
+ return (wxString&)m_windowName;
}
wxString wxWindow::GetLabel() const
{
- return GetTitle();
+ return GetTitle();
}
void wxWindow::SetName( const wxString &name )
{
- m_windowName = name;
+ m_windowName = name;
}
wxString wxWindow::GetName() const
{
- return (wxString&)m_windowName;
+ return (wxString&)m_windowName;
}
bool wxWindow::IsShown() const
{
- return m_isShown;
+ return m_isShown;
}
bool wxWindow::IsRetained()
{
- return FALSE;
+ return FALSE;
}
wxWindow *wxWindow::FindWindow( long id )
{
- if (id == m_windowId) return this;
- wxNode *node = m_children.First();
- while (node)
- {
- wxWindow *child = (wxWindow*)node->Data();
- wxWindow *res = child->FindWindow( id );
- if (res) return res;
- node = node->Next();
- }
- return (wxWindow *) NULL;
+ if (id == m_windowId) return this;
+ wxNode *node = m_children.First();
+ while (node)
+ {
+ wxWindow *child = (wxWindow*)node->Data();
+ wxWindow *res = child->FindWindow( id );
+ if (res) return res;
+ node = node->Next();
+ }
+ return (wxWindow *) NULL;
}
wxWindow *wxWindow::FindWindow( const wxString& name )
{
- if (name == m_windowName) return this;
- wxNode *node = m_children.First();
- while (node)
- {
- wxWindow *child = (wxWindow*)node->Data();
- wxWindow *res = child->FindWindow( name );
- if (res) return res;
- node = node->Next();
- }
- return (wxWindow *) NULL;
+ if (name == m_windowName) return this;
+ wxNode *node = m_children.First();
+ while (node)
+ {
+ wxWindow *child = (wxWindow*)node->Data();
+ wxWindow *res = child->FindWindow( name );
+ if (res) return res;
+ node = node->Next();
+ }
+ return (wxWindow *) NULL;
}
void wxWindow::SetScrollbar( int orient, int pos, int thumbVisible,
int range, bool refresh )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
-
- wxASSERT_MSG( (m_wxwindow != NULL), "window needs client area" );
-
- if (!m_wxwindow) return;
+ wxCHECK_RET( m_widget != NULL, "invalid window" );
- m_hasScrolling = TRUE;
+ wxCHECK_RET( m_wxwindow != NULL, "window needs client area for scrolling" );
- if (orient == wxHORIZONTAL)
- {
- float fpos = (float)pos;
- float frange = (float)range;
- float fthumb = (float)thumbVisible;
- if (fpos > frange-fthumb) fpos = frange-fthumb;
- if (fpos < 0.0) fpos = 0.0;
+ m_hasScrolling = TRUE;
- if ((fabs(frange-m_hAdjust->upper) < 0.2) &&
- (fabs(fthumb-m_hAdjust->page_size) < 0.2))
+ if (orient == wxHORIZONTAL)
{
- SetScrollPos( orient, pos, refresh );
- return;
- }
+ float fpos = (float)pos;
+ float frange = (float)range;
+ float fthumb = (float)thumbVisible;
+ if (fpos > frange-fthumb) fpos = frange-fthumb;
+ if (fpos < 0.0) fpos = 0.0;
+
+ if ((fabs(frange-m_hAdjust->upper) < 0.2) &&
+ (fabs(fthumb-m_hAdjust->page_size) < 0.2))
+ {
+ SetScrollPos( orient, pos, refresh );
+ return;
+ }
- m_oldHorizontalPos = fpos;
+ m_oldHorizontalPos = fpos;
- m_hAdjust->lower = 0.0;
- m_hAdjust->upper = frange;
- m_hAdjust->value = fpos;
- m_hAdjust->step_increment = 1.0;
- m_hAdjust->page_increment = (float)(wxMax(fthumb,0));
- m_hAdjust->page_size = fthumb;
- }
- else
- {
- float fpos = (float)pos;
- float frange = (float)range;
- float fthumb = (float)thumbVisible;
- if (fpos > frange-fthumb) fpos = frange-fthumb;
- if (fpos < 0.0) fpos = 0.0;
-
- if ((fabs(frange-m_vAdjust->upper) < 0.2) &&
- (fabs(fthumb-m_vAdjust->page_size) < 0.2))
- {
- SetScrollPos( orient, pos, refresh );
- return;
+ m_hAdjust->lower = 0.0;
+ m_hAdjust->upper = frange;
+ m_hAdjust->value = fpos;
+ m_hAdjust->step_increment = 1.0;
+ m_hAdjust->page_increment = (float)(wxMax(fthumb,0));
+ m_hAdjust->page_size = fthumb;
}
+ else
+ {
+ float fpos = (float)pos;
+ float frange = (float)range;
+ float fthumb = (float)thumbVisible;
+ if (fpos > frange-fthumb) fpos = frange-fthumb;
+ if (fpos < 0.0) fpos = 0.0;
+
+ if ((fabs(frange-m_vAdjust->upper) < 0.2) &&
+ (fabs(fthumb-m_vAdjust->page_size) < 0.2))
+ {
+ SetScrollPos( orient, pos, refresh );
+ return;
+ }
- m_oldVerticalPos = fpos;
+ m_oldVerticalPos = fpos;
- m_vAdjust->lower = 0.0;
- m_vAdjust->upper = frange;
- m_vAdjust->value = fpos;
- m_vAdjust->step_increment = 1.0;
- m_vAdjust->page_increment = (float)(wxMax(fthumb,0));
- m_vAdjust->page_size = fthumb;
- }
+ m_vAdjust->lower = 0.0;
+ m_vAdjust->upper = frange;
+ m_vAdjust->value = fpos;
+ m_vAdjust->step_increment = 1.0;
+ m_vAdjust->page_increment = (float)(wxMax(fthumb,0));
+ m_vAdjust->page_size = fthumb;
+ }
- if (m_wxwindow->window)
- {
- if (orient == wxHORIZONTAL)
- gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );
- else
- gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" );
+ if (m_wxwindow->window)
+ {
+ if (orient == wxHORIZONTAL)
+ gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );
+ else
+ gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" );
- gtk_widget_set_usize( m_widget, m_width, m_height );
- }
+ gtk_widget_set_usize( m_widget, m_width, m_height );
+ }
}
void wxWindow::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_RET( m_widget != NULL, "invalid window" );
- wxASSERT_MSG( (m_wxwindow != NULL), "window needs client area" );
+ wxCHECK_RET( m_wxwindow != NULL, "window needs client area for scrolling" );
- if (!m_wxwindow) return;
-
- if (orient == wxHORIZONTAL)
- {
- float fpos = (float)pos;
- if (fpos > m_hAdjust->upper - m_hAdjust->page_size) fpos = m_hAdjust->upper - m_hAdjust->page_size;
- if (fpos < 0.0) fpos = 0.0;
- m_oldHorizontalPos = fpos;
+ if (orient == wxHORIZONTAL)
+ {
+ float fpos = (float)pos;
+ if (fpos > m_hAdjust->upper - m_hAdjust->page_size) fpos = m_hAdjust->upper - m_hAdjust->page_size;
+ if (fpos < 0.0) fpos = 0.0;
+ m_oldHorizontalPos = fpos;
- if (fabs(fpos-m_hAdjust->value) < 0.2) return;
- m_hAdjust->value = fpos;
- }
- else
- {
- float fpos = (float)pos;
- if (fpos > m_vAdjust->upper - m_vAdjust->page_size) fpos = m_vAdjust->upper - m_vAdjust->page_size;
- if (fpos < 0.0) fpos = 0.0;
- m_oldVerticalPos = fpos;
+ if (fabs(fpos-m_hAdjust->value) < 0.2) return;
+ m_hAdjust->value = fpos;
+ }
+ else
+ {
+ float fpos = (float)pos;
+ if (fpos > m_vAdjust->upper - m_vAdjust->page_size) fpos = m_vAdjust->upper - m_vAdjust->page_size;
+ if (fpos < 0.0) fpos = 0.0;
+ m_oldVerticalPos = fpos;
- if (fabs(fpos-m_vAdjust->value) < 0.2) return;
- m_vAdjust->value = fpos;
- }
+ if (fabs(fpos-m_vAdjust->value) < 0.2) return;
+ m_vAdjust->value = fpos;
+ }
- if (!m_isScrolling)
- {
- if (m_wxwindow->window)
+ if (!m_isScrolling)
{
- if (orient == wxHORIZONTAL)
- gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" );
- else
- gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" );
+ if (m_wxwindow->window)
+ {
+ if (orient == wxHORIZONTAL)
+ gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" );
+ else
+ gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" );
+ }
}
- }
}
int wxWindow::GetScrollThumb( int orient ) const
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_MSG( m_widget != NULL, 0, "invalid window" );
- wxASSERT_MSG( (m_wxwindow != NULL), "window needs client area" );
+ wxCHECK_MSG( m_wxwindow != NULL, 0, "window needs client area for scrolling" );
- if (!m_wxwindow) return 0;
-
- if (orient == wxHORIZONTAL)
- return (int)(m_hAdjust->page_size+0.5);
- else
- return (int)(m_vAdjust->page_size+0.5);
+ if (orient == wxHORIZONTAL)
+ return (int)(m_hAdjust->page_size+0.5);
+ else
+ return (int)(m_vAdjust->page_size+0.5);
}
int wxWindow::GetScrollPos( int orient ) const
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
-
- wxASSERT_MSG( (m_wxwindow != NULL), "window needs client area" );
+ wxCHECK_MSG( m_widget != NULL, 0, "invalid window" );
- if (!m_wxwindow) return 0;
+ wxCHECK_MSG( m_wxwindow != NULL, 0, "window needs client area for scrolling" );
- if (orient == wxHORIZONTAL)
- return (int)(m_hAdjust->value+0.5);
- else
- return (int)(m_vAdjust->value+0.5);
+ if (orient == wxHORIZONTAL)
+ return (int)(m_hAdjust->value+0.5);
+ else
+ return (int)(m_vAdjust->value+0.5);
}
int wxWindow::GetScrollRange( int orient ) const
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+ wxCHECK_MSG( m_widget != NULL, 0, "invalid window" );
- wxASSERT_MSG( (m_wxwindow != NULL), "window needs client area" );
+ wxCHECK_MSG( m_wxwindow != NULL, 0, "window needs client area for scrolling" );
- if (!m_wxwindow) return 0;
-
- if (orient == wxHORIZONTAL)
- return (int)(m_hAdjust->upper+0.5);
- else
- return (int)(m_vAdjust->upper+0.5);
+ if (orient == wxHORIZONTAL)
+ return (int)(m_hAdjust->upper+0.5);
+ else
+ return (int)(m_vAdjust->upper+0.5);
}
void wxWindow::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
{
- wxASSERT_MSG( (m_widget != NULL), "invalid window" );
-
- wxASSERT_MSG( (m_wxwindow != NULL), "window needs client area" );
+ wxCHECK_RET( m_widget != NULL, "invalid window" );
- if (!m_wxwindow) return;
+ wxCHECK_RET( m_wxwindow != NULL, "window needs client area for scrolling" );
int cw = 0;
int ch = 0;
int h = ch - abs(dy);
if ((h < 0) || (w < 0))
{
- Refresh();
- return;
+ Refresh();
+ return;
}
int s_x = 0;
int s_y = 0;
if (!m_scrollGC)
{
- m_scrollGC = gdk_gc_new( m_wxwindow->window );
- gdk_gc_set_exposures( m_scrollGC, TRUE );
+ m_scrollGC = gdk_gc_new( m_wxwindow->window );
+ gdk_gc_set_exposures( m_scrollGC, TRUE );
}
gdk_window_copy_area( m_wxwindow->window, m_scrollGC, d_x, d_y,
- m_wxwindow->window, s_x, s_y, w, h );
+ m_wxwindow->window, s_x, s_y, w, h );
wxRect rect;
if (dx < 0) rect.x = cw+dx; else rect.x = 0;
c->bottom.SameAs (m_editorFrame, wxBottom, 0);
c->width.Unconstrained();
#ifdef __WXGTK__
- c->height.Absolute(140);
+ c->height.Absolute(105);
#else
c->height.Absolute(60);
#endif
projects / wxWidgets.git / commitdiff
