Attachment #243173 for bug #126867

Lines 145-151 Link Here

(-)xaralx-svn.orig//Kernel/cnamecol.cpp (-1 / +1 lines)
145	CNamedColourReplacer::CNamedColourReplacer(ColourFillAttribute* pFillAttr, DocColour* pColour)	145	CNamedColourReplacer::CNamedColourReplacer(ColourFillAttribute* pFillAttr, DocColour* pColour)
146	{	146	{
147	// call the default constructor that NULLs all the member pointers	147	// call the default constructor that NULLs all the member pointers
148	CNamedColourReplacer::CNamedColourReplacer();	148	CNamedColourReplacer();
149	Initialise(pFillAttr, pColour);	149	Initialise(pFillAttr, pColour);
150	}	150	}
151		151




	LastSmallBarPos.x = LastSmallBarPos.y = -1;
	
	// create a bitmap for the drag rendering
//#pragma message( __LOCMSG__ "Not using dither pattern" )
//  WORD WindowsGray [] = { 0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA } ;
//	BrushBitmap.CreateBitmap (8, 8, 1, 1, (LPSTR) WindowsGray) ;
	BrushBitmap.Create( 8, 8, 1 );


void BaseBar::SetFormatVariables()
{
//#pragma message( __LOCMSG__ "BaseBar::SetFormatVariables - do nothing" )
	TRACE( _T("Warning - BaseBar::SetFormatVariables called") );
/*	if (GetMainFrame()->GetDockBar(ParentDockBarType)->IsBigControls())
		SeparatorWidth = LARGE_SEPARATOR;

			 
void BaseBar::CloseCombos()
{															 
//#pragma message( __LOCMSG__ "BaseBar::CloseCombos - do nothing" )
	TRACE( _T("Warning - BaseBar::CloseCombos called") );
/*	String_256 ClassNameStr;
	HWND CurrentChild;


wxRect  BaseBar::GetFormatRect(DockBarType BarType)
{
//#pragma message( __LOCMSG__ "BaseBar::GetFormatRect - do nothing" )
	TRACE( _T("Warning - BaseBar::GetFormatRect called") );
/*	OILDockingBar* DockBar = GetMainFrame()->GetDockBar(BarType);
 	switch(BarType)


DockBarType BaseBar::IsPointerOverDock(wxPoint point)
{
//#pragma message( __LOCMSG__ "BaseBar::IsPointerOverDock - do nothing" )
	TRACE( _T("Warning - BaseBar::IsPointerOverDock called") );
/*	wxRect temp ;
	OILFixedDockingBar * ParentDockBar;

{
	wxRect temp;

//#pragma message( __LOCMSG__ "BaseBar::SetBarSize - do nothing" )
	TRACE( _T("Warning - BaseBar::SetBarSize called") );
/*	switch(BarType)
	{


BOOL BaseBar::Show(DialogBarOp* Op)
{
//#pragma message( __LOCMSG__ "BaseBar::Show - do nothing" )
	TRACE( _T("Warning - BaseBar::Show called") );
/*	if (Op->IS_KIND_OF(InformationBarOp))
		((InformationBarOp*)Op)->SetInfo();

********************************************************************************************/
BOOL BaseBar::Hide(DialogBarOp* Op)
{
//#pragma message( __LOCMSG__ "BaseBar::Hide - do nothing" )
	TRACE( _T("Warning - BaseBar::Hide called") );
/*	BOOL DoTidy = DO_TIDY;



BOOL BaseBar::Create(DialogBarOp* Op)
{
//#pragma message( __LOCMSG__ "BaseBar::Create - do nothing" )
	TRACE( _T("Warning - BaseBar::Create called") );
/*	InRecreate = TRUE;
	pOp = Op; 

BOOL BaseBar::RecreateAt(KernelBarPos Pos,DockBarType DockBarTyp,
					  BaseBar* BaseBar, DialogBarOp* Op, wxWindow* OldHwnd) 
{
//#pragma message( __LOCMSG__ "BaseBar::RecreateAt - do nothing" )
	TRACE( _T("Warning - BaseBar::RecreateAt called") );
/*	LastSmallBarPos = Pos;
	pOp = Op; 


BOOL BaseBar::Recreate(DockBarType DockBarTyp, BaseBar* BaseBar, DialogBarOp* Op,BOOL CanCopy ) 
{
//#pragma message( __LOCMSG__ "BaseBar::Recreate - do nothing" )
	TRACE( _T("Warning - BaseBar::Recreate called") );
/*	pOp = Op; 
	ParentDockBarType = DockBarTyp; // Record the current dock ba


KernelBarPos  * BaseBar::GetBarPosition()
{
//#pragma message( __LOCMSG__ "BaseBar::GetBarPosition - do nothing" )
	TRACE( _T("Warning - BaseBar::GetBarPosition called") );
//	return GetMainFrame()->GetDockBar(ParentDockBarType)->GetBarPos(GetSafeHwnd());



BOOL BaseBar::FormatLineFeeds(INT32 Targetx,wxSize * pBarSize, INT32 * pNoLFs)
{
//#pragma message( __LOCMSG__ "BaseBar::FormatLineFeeds - do nothing" )
	TRACE( _T("Warning - BaseBar::FormatLineFeeds called") );
/*	//List is empty	just return 
		if (pOp->IsListEmpty())


UINT32 BaseBar::GetNearestControl(wxPoint DropPoint)
{
//#pragma message( __LOCMSG__ "BaseBar::GetNearestControl - do nothing" )
	TRACE( _T("Warning - BaseBar::GetNearestControl called") );
/*	HWND hcontrol;			 						// handle of current control
	INT32 ControlIndex = 0;	 						// index in bar item list

{
//	TRACEUSER( "Gerry", _T("FormatFloatingBar\n"));

//#pragma message( __LOCMSG__ "BaseBar::FormatFloatingBar - do nothing" )
	TRACE( _T("Warning - BaseBar::FormatFloatingBar called") );
/*	HWND hcontrol;
 	wxSize BarSize(0,0);

{
//	TRACEUSER( "Gerry", _T("FormatHorizontalBar\n"));

//#pragma message( __LOCMSG__ "BaseBar::FormatHorizontalBar - do nothing" )
	TRACE( _T("Warning - BaseBar::FormatHorizontalBar called") );
/*	BOOL AtFront = TRUE; 	
	HWND hcontrol;

BOOL BaseBar::FormatVerticalBar(BOOL MoveControls,ForceControlSize ForceSize)
{
//	TRACEUSER( "Gerry", _T("FormatVerticalBar\n"));
//#pragma message( __LOCMSG__ "BaseBar::FormatVerticalBar - do nothing" )
	TRACE( _T("Warning - BaseBar::FormatVerticalBar called") );
/*	BOOL AtFront = TRUE; 	
	HWND hcontrol;


HINSTANCE BaseBar::GetModuleInst(const BarControlInfo*pBarCtlInfo,UINT32 * ToolModuleID )
{
//#pragma message( __LOCMSG__ "BaseBar::GetModuleInst - do nothing" )
	TRACE( _T("Warning - BaseBar::GetModuleInst called") );
/*	*ToolModuleID = Tool::GetModuleID(pBarCtlInfo->ToolID); 


 									HINSTANCE ModuleInst,
 									UINT32 ToolModuleID)
{
//#pragma message( __LOCMSG__ "BaseBar::GetModuleInst - do nothing" )
	TRACE( _T("Warning - BaseBar::GetModuleInst called") );
/*	BarItemType	 ThisControlType = OTHERCONTROL;



void BaseBar::InformControlsDead()
{														 
//#pragma message( __LOCMSG__ "BaseBar::InformControlsDead - do nothing" )
	TRACE( _T("Warning - BaseBar::InformControlsDead called") );
/* 	HWND CurrentChild;
	HWND NextChild; 


void BaseBar::StartDrag(wxPoint point, DlgDragType TypeOfDrag)
{
//#pragma message( __LOCMSG__ "BaseBar::StartDrag - do nothing" )
	TRACE( _T("Warning - BaseBar::StartDrag called") );
/*#ifdef STANDALONE
#ifndef EXCLUDE_GALS

// Message map - maintained by Class Wizard.

BEGIN_EVENT_TABLE( BaseBar, wxWindow )
//#pragma message( __LOCMSG__ "Removed BaseBar message map" )
/*	ON_WM_NCCALCSIZE()
	ON_WM_NCPAINT()
	ON_WM_NCACTIVATE()


static void PatB( wxDC &DC, INT32 x, INT32 y, INT32 dx, INT32 dy, wxColour &rgb )
{
//#pragma message( __LOCMSG__ "PatB - do nothing" )
	TRACE( _T("Warning - PatB called") );
/*	RECT rect;



void BaseBar::Paint3dPlinth(wxDC* pDC, wxRect *rect, BOOL PlinthOut)
{
//#pragma message( __LOCMSG__ "BaseBar::Paint3dPlinth - do nothing" )
	TRACE( _T("Warning - BaseBar::Paint3dPlinth called") );
/*	if((LOBYTE(LOWORD(GetVersion()))) > 3 )
	{

********************************************************************************************/


//#pragma message( __LOCMSG__ "BaseBar::OnDrawItem removed" )
/*void BaseBar::OnDrawItem( INT32 nIDCtl, LPDRAWITEMSTRUCT lpDrawItemStruct )
{
	// owner drawn text button


********************************************************************************************/
						
//#pragma message( __LOCMSG__ "BaseBar::OnParentNotify removed" )
/*void BaseBar::OnParentNotify( UINT32 message, LPARAM lParam )
{
	if(message == WM_LBUTTONDOWN)


********************************************************************************************/

//#pragma message( __LOCMSG__ "BaseBar::OnKillFocus removed" )
/*void BaseBar::OnKillFocus( wxWindow*Wnd )
{
	wxWindow::OnKillFocus(Wnd);

********************************************************************************************/


//#pragma message( __LOCMSG__ "BaseBar::OnSetFocus removed" )
/*void BaseBar::OnSetFocus( wxWindow * Wnd )
{
	wxWindow::OnSetFocus(Wnd);


********************************************************************************************/

//#pragma message( __LOCMSG__ "BaseBar::OnActivateApp removed" )
/*void BaseBar::OnActivateApp( BOOL  bActive, HTASK  hTask )
{
	


********************************************************************************************/

//#pragma message( __LOCMSG__ "BaseBar::OnActivate removed" )
/*void BaseBar::OnActivate( UINT32 State, wxWindow* pWndOther, BOOL bMinimized ) 
{
	


********************************************************************************************/

//#pragma message( __LOCMSG__ "BaseBar::OnMouseActivate removed" )
/*INT32 BaseBar::OnMouseActivate( wxWindow* pDesktopWnd, UINT32 nHitTest, UINT32 message ) 
{
	


********************************************************************************************/

//#pragma message( __LOCMSG__ "BaseBar::OnDestroy removed" )
/*void BaseBar ::OnDestroy( )
{
 


********************************************************************************************/

//#pragma message( __LOCMSG__ "BaseBar::ListLostFocus removed" )
/*void  BaseBar::ListLostFocus(void)
{
 


********************************************************************************************/

//#pragma message( __LOCMSG__ "BaseBar::ListSelChanged removed" )
/*void  BaseBar::ListSelChanged(void)
{
//	if( pOp->IsKindOf(CC_RUNTIME_CLASS(SuperGallery)) )


********************************************************************************************/

//#pragma message( __LOCMSG__ "BaseBar::DoResize removed" )
/*LRESULT  BaseBar::DoResize(WPARAM , LPARAM)
{
	// ZZZZ


********************************************************************************************/

//#pragma message( __LOCMSG__ "BaseBar::GetBarSize removed" )
/*LRESULT  BaseBar::GetBarSize(WPARAM DockType , LPARAM ControlS)
{
	DockBarType ThisDock = (DockBarType) DockType;	

{
	wxRect ReturnRect(0,0,0,0);

//#pragma message( __LOCMSG__ "BaseBar::GetBarsDims - do nothing" )
	TRACE( _T("Warning - BaseBar::GetBarsDims called") );
/*	OILDockingBar* FloatBars = GetMainFrame ()->GetDockBar (DockBarType);//DOCKBAR_FLOAT);
	BOOL BigControls = FloatBars->IsBigControls ();


********************************************************************************************/

//#pragma message( __LOCMSG__ "BaseBar::GetBarSize removed" )
/*LRESULT BaseBar::SetControlFocus(WPARAM State, LPARAM Hwnd)
{
	if (State == TRUE)


********************************************************************************************/

//#pragma message( __LOCMSG__ "BaseBar::GetBarSize removed" )
/*LRESULT  BaseBar::StartControlDrag(WPARAM State, LPARAM Hwnd)
{
#ifdef STANDALONE

#endif
} */											 	

//#pragma message( __LOCMSG__ "BaseBar::GetBarSize removed" )
/*LRESULT  BaseBar::EndControlDrag(WPARAM State, LPARAM Hwnd)
{
	return 0;


LRESULT BaseBar::WindowProc( UINT32 Message, WPARAM wParam, LPARAM lParam )
{
//#pragma message( __LOCMSG__ "BaseBar::WindowProc - do nothing" )
	TRACE( _T("Warning - BaseBar::WindowProc called") );
/*	// First send the message to the dialog manager 
	DialogManager::SendDialogMessage(this,

	Scope:		Protected

********************************************************************************************/
//#pragma message( __LOCMSG__ "BaseBar::OnNcCalcSize removed" )
/*void BaseBar::OnNcCalcSize(BOOL bCalcValidRects, NCCALCSIZE_PARAMS FAR* lpncsp)
{
	// So that we are compatible with different screen modes we will paint the non-client area

	Scope:		Protected

********************************************************************************************/
//#pragma message( __LOCMSG__ "BaseBar::OnNcPaint removed" )
/*void BaseBar::OnNcPaint()
{
	

#define ROP_PSDPxax  0x00B8074AL


//#pragma message( __LOCMSG__ "BaseBar::PlotStretchedMaskedBitmap removed" )
/*BOOL BaseBar::PlotStretchedMaskedBitmap(wxDC* destDC, CBitmap* srcBitmap,wxRect Pos)
{
	

	// make sure that DrawCaption shows the correct title
	SetLabel( pOp->GetName() );
	
//#pragma message( __LOCMSG__ "Remove MSW frame redrawing stuff" )
/*	UINT32 DrawFlags = DC_TEXT|DC_SMALLCAP;
	
	if(IsActive)


void BaseBar::PaintDialogNonClient(BOOL IsActive)
{
//#pragma message( __LOCMSG__ "BaseBar::PaintDialogNonClient - do nothing" )
	TRACE( _T("Warning - BaseBar::PaintDialogNonClient called") );
/*	// Get the System Frame Size
	BorderWidth=wxSystemSettings::GetMetric(SM_CXFRAME);


********************************************************************************************/

//#pragma message( __LOCMSG__ "BaseBar::OnNcPaint removed" )
/*BOOL BaseBar::OnNcActivate(BOOL IsActive)
{
	


********************************************************************************************/
										 
//#pragma message( __LOCMSG__ "BaseBar::OnPaint removed" )
/*void BaseBar::OnPaint()
{
	wxPaintDC  PaintDC(this); // device context for painting


void BaseBar::PaintChicagoBorder()
{
//#pragma message( __LOCMSG__ "BaseBar::PaintChicagoBorder - do nothing" )
	TRACE( _T("Warning - BaseBar::PaintChicagoBorder called") );
/*	wxRect WinRect( GetClientRect() );
	wxRect ParWin( GetParent()->GetRect() );


********************************************************************************************/

//#pragma message( __LOCMSG__ "BaseBar::OnNcHitTest removed" )
/*UINT32 BaseBar::OnNcHitTest(wxPoint point)
{



********************************************************************************************/

//#pragma message( __LOCMSG__ "BaseBar::OnNcRButtonDown removed" )
/*void BaseBar::OnNcRButtonDown(UINT32 nHitTest, wxPoint point)
{
} */


********************************************************************************************/

//#pragma message( __LOCMSG__ "BaseBar::OnNcHitTest removed" )
/*void BaseBar::OnNcHitTest(UINT32 nHitTest, wxPoint point)
{



********************************************************************************************/

//#pragma message( __LOCMSG__ "BaseBar::OnLButtonDown removed" )
/*void BaseBar::OnLButtonDown(UINT32 nFlags, wxPoint point)
{
	// make sure we're not clicking on a disabled button


********************************************************************************************/

//#pragma message( __LOCMSG__ "BaseBar::OnMouseWheel removed" )
/*BOOL BaseBar::OnMouseWheel(UINT32 nFlags, short zDelta, wxPoint pt)
{
	TRACEUSER( "Matt", _T("MouseWheel Scroll In BaseBar!\n"));


********************************************************************************************/

//#pragma message( __LOCMSG__ "BaseBar::OnLButtonDblClk removed" )
/*void BaseBar::OnLButtonDblClk( UINT32 nFlags, wxPoint point )
{
	//MessageBeep(MB_OK);

********************************************************************************************/
BOOL BaseBar::TidyUpControlDrag()
{
//#pragma message( __LOCMSG__ "BaseBar::TidyUpControlDrag - do nothing" )
	TRACE( _T("Warning - BaseBar::TidyUpControlDrag called") );
/*	CtlDragState = NO_DRAG;
	DragManagerOp::SetDragActive(FALSE);

	InRecreate = FALSE;
	CurrentBar = NULL;

//#pragma message( __LOCMSG__ "Remove DragManagerOp::SetDragActive usage" )
//	DragManagerOp::SetDragActive(FALSE); 
	return TRUE;
}

********************************************************************************************/
BOOL BaseBar::DropControl(wxPoint point, wxWindow* OverBar,BOOL InsertSeparator)
{
//#pragma message( __LOCMSG__ "BaseBar::DropControl - do nothing" )
	TRACE( _T("Warning - BaseBar::DropControl called") );
/*	BOOL DeleteSeparator = FALSE;


********************************************************************************************/
BOOL BaseBar::EndControlDrag(wxPoint point)
{
//#pragma message( __LOCMSG__ "BaseBar::EndControlDrag - do nothing" )
	TRACE( _T("Warning - BaseBar::EndControlDrag called") );
/*	// go to screen co-ords	- we may be dropping on a different bar
	wxPoint sPnt= point;

	SeeAlso:	-

********************************************************************************************/
//#pragma message( __LOCMSG__ "BaseBar::OnLButtonUp removed" )
/*void BaseBar::OnLButtonUp(UINT32 nFlags, wxPoint point)
{
	if(CtlDragState == DRAGGING)


void BaseBar::ConvertToolbarOnStartup ()
{
//#pragma message( __LOCMSG__ "BaseBar::ConvertToolbarOnStartup - do nothing" )
	TRACE( _T("Warning - BaseBar::ConvertToolbarOnStartup called") );
/*	ERROR3IF (pOp->GetName () != String_32 (TEXT ("Toolbar")), "BaseBar::ConvertToolbarOnStartup () - Call that a toolbar!");
	


********************************************************************************************/

//#pragma message( __LOCMSG__ "BaseBar::MoveBar removed" )
/*LRESULT BaseBar::MoveBar(WPARAM Dock, LPARAM Pos)
{	
	DockBarType NewDockType = (DockBarType)Dock;

	SeeAlso:	-

********************************************************************************************/
//#pragma message( __LOCMSG__ "BaseBar::OnMouseMove removed" )
/*void BaseBar::OnMouseMove(UINT32 Flags, wxPoint Point)
{
	if(CtlDragState == DRAGGING)


void BaseBar::CacheAllDockRects()
{
//#pragma message( __LOCMSG__ "BaseBar::CacheAllDockRects - do nothing" )
	TRACE( _T("Warning - BaseBar::CacheAllDockRects called") );
/*	OILFixedDockingBar* DockBar;


	}

	// MFC DrawDragRect function
//#pragma message( __LOCMSG__ "Remove DrawDragRect usage" )
//	pDisplayDC->DrawDragRect( &Rect, NewSize, &OldRect, OldSize );
	
	/*


void BaseBar::PaintXORDragRect(wxRect Rect,DockBarType DockBar)
{
//#pragma message( __LOCMSG__ "Remove DC::PatBlt usage" )
/*	DWORD dwRop = PATINVERT;

	wxScreenDC	DisplayDC;

Lines 122-128 Link Here

(-)xaralx-svn.orig//wxOil/bitmapgriddropdown.cpp (-1 / +1 lines)
122	#include "grnddib.h"	122	#include "grnddib.h"
123	#include "ppbrush.h"	123	#include "ppbrush.h"
124	#include "qualattr.h"	124	#include "qualattr.h"
125		125	#include <algorithm>
126		126
127		127
128		128

Lines 122-128 Link Here

(-)xaralx-svn.orig//wxOil/ftfonts.cpp (+2 lines)
122	#include FT_TYPE1_TABLES_H	122	#include FT_TYPE1_TABLES_H
123		123
124	#ifdef __WXGTK20__	124	#ifdef __WXGTK20__
		125	#define GSocket GlibSocket
125	#include <gtk/gtk.h>	126	#include <gtk/gtk.h>
		127	#undef GSocket
126	extern GtkWidget *wxGetRootWindow();	128	extern GtkWidget *wxGetRootWindow();
127	#endif	129	#endif
128		130

Return to bug 126867