Changed a few true -> TRUE
added #ifdef GTK 1.2 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,4 +1,23 @@
|
|||||||
|
|
||||||
|
25th June '99: Seventh wxGTK 2.1 snapshot released
|
||||||
|
|
||||||
|
Many fixes to th new makefile system. The last version gave
|
||||||
|
immediate crashes on all Unices except Linux when linked
|
||||||
|
dynamically against an application. I reordered the object
|
||||||
|
files in the library as I guess that this was the cause.
|
||||||
|
|
||||||
|
Added icons to message box. This also slightly killed the
|
||||||
|
layout so this needs to be changed again.
|
||||||
|
|
||||||
|
wxGTK now chooses the best visual available on the display instead
|
||||||
|
of the default one.
|
||||||
|
|
||||||
|
Fixed wxProgressDialog again.
|
||||||
|
|
||||||
|
Some more corrections I forgot.
|
||||||
|
|
||||||
|
New wxPython (includes new layout system and printing).
|
||||||
|
|
||||||
15th June '99: Sixth wxGTK 2.1 snapshot released
|
15th June '99: Sixth wxGTK 2.1 snapshot released
|
||||||
|
|
||||||
|
|
||||||
|
@@ -218,8 +218,8 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
sm_abortIt = true;
|
sm_abortIt = TRUE;
|
||||||
keepGoing = false;
|
keepGoing = FALSE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
wxYield();
|
wxYield();
|
||||||
|
@@ -363,7 +363,7 @@ void wxSplitterWindow::OnSize(wxSizeEvent& event)
|
|||||||
parent = parent->GetParent();
|
parent = parent->GetParent();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool iconized = false;
|
bool iconized = FALSE;
|
||||||
wxFrame *frame = wxDynamicCast(parent, wxFrame);
|
wxFrame *frame = wxDynamicCast(parent, wxFrame);
|
||||||
if ( frame )
|
if ( frame )
|
||||||
iconized = frame->IsIconized();
|
iconized = frame->IsIconized();
|
||||||
|
@@ -4,8 +4,7 @@
|
|||||||
##
|
##
|
||||||
## Process this file with automake to produce Makefile.in
|
## Process this file with automake to produce Makefile.in
|
||||||
|
|
||||||
AUTOMAKE_OPTIONS = 1.3
|
AUTOMAKE_OPTIONS = 1.3 no-dependencies
|
||||||
# no-dependencies
|
|
||||||
|
|
||||||
SUFFIXES = .cpp .c
|
SUFFIXES = .cpp .c
|
||||||
|
|
||||||
|
@@ -367,14 +367,17 @@ bool wxApp::OnInitGui()
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
#if (GTK_MINOR_VERSION > 0)
|
||||||
/* assume 8-bit true or static colors. this really
|
/* assume 8-bit true or static colors. this really
|
||||||
exists. */
|
exists. */
|
||||||
GdkVisual* vis = gdk_colormap_get_visual( cmap );
|
GdkVisual* vis = gdk_colormap_get_visual( cmap );
|
||||||
index = (r >> (5 - vis->red_prec)) << vis->red_shift;
|
index = (r >> (5 - vis->red_prec)) << vis->red_shift;
|
||||||
index |= (g >> (5 - vis->green_prec)) << vis->green_shift;
|
index |= (g >> (5 - vis->green_prec)) << vis->green_shift;
|
||||||
index |= (b >> (5 - vis->blue_prec)) << vis->blue_shift;
|
index |= (b >> (5 - vis->blue_prec)) << vis->blue_shift;
|
||||||
|
#else
|
||||||
|
wxFAIL_MSG( _T("Unsupported graphics hardware") );
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
m_colorCube[ (r*1024) + (g*32) + b ] = index;
|
m_colorCube[ (r*1024) + (g*32) + b ] = index;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -4,8 +4,7 @@
|
|||||||
##
|
##
|
||||||
## Process this file with automake to produce Makefile.in
|
## Process this file with automake to produce Makefile.in
|
||||||
|
|
||||||
AUTOMAKE_OPTIONS = 1.3
|
AUTOMAKE_OPTIONS = 1.3 no-dependencies
|
||||||
# no-dependencies
|
|
||||||
|
|
||||||
SUFFIXES = .cpp .c
|
SUFFIXES = .cpp .c
|
||||||
|
|
||||||
|
@@ -367,14 +367,17 @@ bool wxApp::OnInitGui()
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
#if (GTK_MINOR_VERSION > 0)
|
||||||
/* assume 8-bit true or static colors. this really
|
/* assume 8-bit true or static colors. this really
|
||||||
exists. */
|
exists. */
|
||||||
GdkVisual* vis = gdk_colormap_get_visual( cmap );
|
GdkVisual* vis = gdk_colormap_get_visual( cmap );
|
||||||
index = (r >> (5 - vis->red_prec)) << vis->red_shift;
|
index = (r >> (5 - vis->red_prec)) << vis->red_shift;
|
||||||
index |= (g >> (5 - vis->green_prec)) << vis->green_shift;
|
index |= (g >> (5 - vis->green_prec)) << vis->green_shift;
|
||||||
index |= (b >> (5 - vis->blue_prec)) << vis->blue_shift;
|
index |= (b >> (5 - vis->blue_prec)) << vis->blue_shift;
|
||||||
|
#else
|
||||||
|
wxFAIL_MSG( _T("Unsupported graphics hardware") );
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
m_colorCube[ (r*1024) + (g*32) + b ] = index;
|
m_colorCube[ (r*1024) + (g*32) + b ] = index;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user