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

'[1219035] cleanup: miscellaneous' and minor source cleaning.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-06-13 12:19:33 +00:00
parent 490120b404
commit d0ee33f5c6
31 changed files with 598 additions and 597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gtk1/bitmap.cpp
View File

@@ -474,7 +474,7 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
if (!pixval)
{
char bit=1;
char shift = bit << w % 8;
char shift = bit << (w % 8);
outbyte |= shift;
}
@@ -537,7 +537,7 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
if (pixval)
{
char bit=1;
char shift = bit << w % 8;
char shift = bit << (w % 8);
outbyte |= shift;
}

26
src/gtk1/colordlg.cpp
View File

@@ -44,25 +44,25 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
wxString title(_("Choose colour"));
m_widget = gtk_color_selection_dialog_new(wxGTK_CONV(title));
if (parent)
gtk_window_set_transient_for(GTK_WINDOW(m_widget),
GTK_WINDOW(parent->m_widget));
GtkColorSelection *sel =
GtkColorSelection *sel =
GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(m_widget)->colorsel);
gtk_color_selection_set_has_palette(sel, true);
return true;
}
int wxColourDialog::ShowModal()
{
ColourDataToDialog();
gint result = gtk_dialog_run(GTK_DIALOG(m_widget));
gtk_widget_hide(m_widget);
switch (result)
{
default:
@@ -73,18 +73,18 @@ int wxColourDialog::ShowModal()
case GTK_RESPONSE_DELETE_EVENT:
case GTK_RESPONSE_CLOSE:
return wxID_CANCEL;
case GTK_RESPONSE_OK:
DialogToColourData();
return wxID_OK;
};
}
}
void wxColourDialog::ColourDataToDialog()
{
GtkColorSelection *sel =
GtkColorSelection *sel =
GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(m_widget)->colorsel);
if (m_data.GetColour().Ok())
{
gtk_color_selection_set_current_color(sel,
@@ -115,13 +115,13 @@ void wxColourDialog::ColourDataToDialog()
void wxColourDialog::DialogToColourData()
{
GtkColorSelection *sel =
GtkColorSelection *sel =
GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(m_widget)->colorsel);
GdkColor clr;
gtk_color_selection_get_current_color(sel, &clr);
m_data.SetColour(wxColour(clr.red >> 8, clr.green >> 8, clr.blue >> 8));
// Extract custom palette:
GtkSettings *settings = gtk_widget_get_settings(GTK_WIDGET(sel));
@@ -140,7 +140,7 @@ void wxColourDialog::DialogToColourData()
}
g_free(colors);
}
g_free(pal);
}