summaryrefslogtreecommitdiff
blob: 0f52bba4db6acd3f015706d1804a87c715072763 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
diff -Nuar xaralx-svn.orig//Kernel/cnamecol.cpp xaralx-svn/Kernel/cnamecol.cpp
--- xaralx-svn.orig//Kernel/cnamecol.cpp	2010-08-07 14:11:33.000000000 -0400
+++ xaralx-svn/Kernel/cnamecol.cpp	2010-08-07 15:38:22.459771453 -0400
@@ -145,7 +145,7 @@
 CNamedColourReplacer::CNamedColourReplacer(ColourFillAttribute* pFillAttr, DocColour* pColour)
 {
 	// call the default constructor that NULLs all the member pointers
-	CNamedColourReplacer::CNamedColourReplacer();
+	CNamedColourReplacer();
 	Initialise(pFillAttr, pColour);
 }
 
diff -Nuar xaralx-svn.orig//wxOil/basebar2.cpp xaralx-svn/wxOil/basebar2.cpp
--- xaralx-svn.orig//wxOil/basebar2.cpp	2010-08-07 14:12:21.000000000 -0400
+++ xaralx-svn/wxOil/basebar2.cpp	2010-08-07 15:37:46.297894794 -0400
@@ -361,7 +361,7 @@
 	LastSmallBarPos.x = LastSmallBarPos.y = -1;
 	
 	// create a bitmap for the drag rendering
-#pragma message( __LOCMSG__ "Not using dither pattern" )
+//#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 );
@@ -496,7 +496,7 @@
 
 void BaseBar::SetFormatVariables()
 {
-#pragma message( __LOCMSG__ "BaseBar::SetFormatVariables - do nothing" )
+//#pragma message( __LOCMSG__ "BaseBar::SetFormatVariables - do nothing" )
 	TRACE( _T("Warning - BaseBar::SetFormatVariables called") );
 /*	if (GetMainFrame()->GetDockBar(ParentDockBarType)->IsBigControls())
 		SeparatorWidth = LARGE_SEPARATOR;
@@ -524,7 +524,7 @@
 			 
 void BaseBar::CloseCombos()
 {															 
-#pragma message( __LOCMSG__ "BaseBar::CloseCombos - do nothing" )
+//#pragma message( __LOCMSG__ "BaseBar::CloseCombos - do nothing" )
 	TRACE( _T("Warning - BaseBar::CloseCombos called") );
 /*	String_256 ClassNameStr;
 	HWND CurrentChild;
@@ -699,7 +699,7 @@
 
 wxRect  BaseBar::GetFormatRect(DockBarType BarType)
 {
-#pragma message( __LOCMSG__ "BaseBar::GetFormatRect - do nothing" )
+//#pragma message( __LOCMSG__ "BaseBar::GetFormatRect - do nothing" )
 	TRACE( _T("Warning - BaseBar::GetFormatRect called") );
 /*	OILDockingBar* DockBar = GetMainFrame()->GetDockBar(BarType);
  	switch(BarType)
@@ -773,7 +773,7 @@
 
 DockBarType BaseBar::IsPointerOverDock(wxPoint point)
 {
-#pragma message( __LOCMSG__ "BaseBar::IsPointerOverDock - do nothing" )
+//#pragma message( __LOCMSG__ "BaseBar::IsPointerOverDock - do nothing" )
 	TRACE( _T("Warning - BaseBar::IsPointerOverDock called") );
 /*	wxRect temp ;
 	OILFixedDockingBar * ParentDockBar;
@@ -822,7 +822,7 @@
 {
 	wxRect temp;
 
-#pragma message( __LOCMSG__ "BaseBar::SetBarSize - do nothing" )
+//#pragma message( __LOCMSG__ "BaseBar::SetBarSize - do nothing" )
 	TRACE( _T("Warning - BaseBar::SetBarSize called") );
 /*	switch(BarType)
 	{
@@ -920,7 +920,7 @@
 
 BOOL BaseBar::Show(DialogBarOp* Op)
 {
-#pragma message( __LOCMSG__ "BaseBar::Show - do nothing" )
+//#pragma message( __LOCMSG__ "BaseBar::Show - do nothing" )
 	TRACE( _T("Warning - BaseBar::Show called") );
 /*	if (Op->IS_KIND_OF(InformationBarOp))
 		((InformationBarOp*)Op)->SetInfo();
@@ -1000,7 +1000,7 @@
 ********************************************************************************************/
 BOOL BaseBar::Hide(DialogBarOp* Op)
 {
-#pragma message( __LOCMSG__ "BaseBar::Hide - do nothing" )
+//#pragma message( __LOCMSG__ "BaseBar::Hide - do nothing" )
 	TRACE( _T("Warning - BaseBar::Hide called") );
 /*	BOOL DoTidy = DO_TIDY;
 
@@ -1038,7 +1038,7 @@
 
 BOOL BaseBar::Create(DialogBarOp* Op)
 {
-#pragma message( __LOCMSG__ "BaseBar::Create - do nothing" )
+//#pragma message( __LOCMSG__ "BaseBar::Create - do nothing" )
 	TRACE( _T("Warning - BaseBar::Create called") );
 /*	InRecreate = TRUE;
 	pOp = Op; 
@@ -1223,7 +1223,7 @@
 BOOL BaseBar::RecreateAt(KernelBarPos Pos,DockBarType DockBarTyp,
 					  BaseBar* BaseBar, DialogBarOp* Op, wxWindow* OldHwnd) 
 {
-#pragma message( __LOCMSG__ "BaseBar::RecreateAt - do nothing" )
+//#pragma message( __LOCMSG__ "BaseBar::RecreateAt - do nothing" )
 	TRACE( _T("Warning - BaseBar::RecreateAt called") );
 /*	LastSmallBarPos = Pos;
 	pOp = Op; 
@@ -1343,7 +1343,7 @@
 
 BOOL BaseBar::Recreate(DockBarType DockBarTyp, BaseBar* BaseBar, DialogBarOp* Op,BOOL CanCopy ) 
 {
-#pragma message( __LOCMSG__ "BaseBar::Recreate - do nothing" )
+//#pragma message( __LOCMSG__ "BaseBar::Recreate - do nothing" )
 	TRACE( _T("Warning - BaseBar::Recreate called") );
 /*	pOp = Op; 
 	ParentDockBarType = DockBarTyp; // Record the current dock ba
@@ -1668,7 +1668,7 @@
 
 KernelBarPos  * BaseBar::GetBarPosition()
 {
-#pragma message( __LOCMSG__ "BaseBar::GetBarPosition - do nothing" )
+//#pragma message( __LOCMSG__ "BaseBar::GetBarPosition - do nothing" )
 	TRACE( _T("Warning - BaseBar::GetBarPosition called") );
 //	return GetMainFrame()->GetDockBar(ParentDockBarType)->GetBarPos(GetSafeHwnd());
 
@@ -2029,7 +2029,7 @@
 
 BOOL BaseBar::FormatLineFeeds(INT32 Targetx,wxSize * pBarSize, INT32 * pNoLFs)
 {
-#pragma message( __LOCMSG__ "BaseBar::FormatLineFeeds - do nothing" )
+//#pragma message( __LOCMSG__ "BaseBar::FormatLineFeeds - do nothing" )
 	TRACE( _T("Warning - BaseBar::FormatLineFeeds called") );
 /*	//List is empty	just return 
 		if (pOp->IsListEmpty())
@@ -2246,7 +2246,7 @@
 
 UINT32 BaseBar::GetNearestControl(wxPoint DropPoint)
 {
-#pragma message( __LOCMSG__ "BaseBar::GetNearestControl - do nothing" )
+//#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
@@ -2461,7 +2461,7 @@
 {
 //	TRACEUSER( "Gerry", _T("FormatFloatingBar\n"));
 
-#pragma message( __LOCMSG__ "BaseBar::FormatFloatingBar - do nothing" )
+//#pragma message( __LOCMSG__ "BaseBar::FormatFloatingBar - do nothing" )
 	TRACE( _T("Warning - BaseBar::FormatFloatingBar called") );
 /*	HWND hcontrol;
  	wxSize BarSize(0,0);
@@ -2769,7 +2769,7 @@
 {
 //	TRACEUSER( "Gerry", _T("FormatHorizontalBar\n"));
 
-#pragma message( __LOCMSG__ "BaseBar::FormatHorizontalBar - do nothing" )
+//#pragma message( __LOCMSG__ "BaseBar::FormatHorizontalBar - do nothing" )
 	TRACE( _T("Warning - BaseBar::FormatHorizontalBar called") );
 /*	BOOL AtFront = TRUE; 	
 	HWND hcontrol;
@@ -3018,7 +3018,7 @@
 BOOL BaseBar::FormatVerticalBar(BOOL MoveControls,ForceControlSize ForceSize)
 {
 //	TRACEUSER( "Gerry", _T("FormatVerticalBar\n"));
-#pragma message( __LOCMSG__ "BaseBar::FormatVerticalBar - do nothing" )
+//#pragma message( __LOCMSG__ "BaseBar::FormatVerticalBar - do nothing" )
 	TRACE( _T("Warning - BaseBar::FormatVerticalBar called") );
 /*	BOOL AtFront = TRUE; 	
 	HWND hcontrol;
@@ -3254,7 +3254,7 @@
 
 HINSTANCE BaseBar::GetModuleInst(const BarControlInfo*pBarCtlInfo,UINT32 * ToolModuleID )
 {
-#pragma message( __LOCMSG__ "BaseBar::GetModuleInst - do nothing" )
+//#pragma message( __LOCMSG__ "BaseBar::GetModuleInst - do nothing" )
 	TRACE( _T("Warning - BaseBar::GetModuleInst called") );
 /*	*ToolModuleID = Tool::GetModuleID(pBarCtlInfo->ToolID); 
 
@@ -3611,7 +3611,7 @@
  									HINSTANCE ModuleInst,
  									UINT32 ToolModuleID)
 {
-#pragma message( __LOCMSG__ "BaseBar::GetModuleInst - do nothing" )
+//#pragma message( __LOCMSG__ "BaseBar::GetModuleInst - do nothing" )
 	TRACE( _T("Warning - BaseBar::GetModuleInst called") );
 /*	BarItemType	 ThisControlType = OTHERCONTROL;
 
@@ -4310,7 +4310,7 @@
 
 void BaseBar::InformControlsDead()
 {														 
-#pragma message( __LOCMSG__ "BaseBar::InformControlsDead - do nothing" )
+//#pragma message( __LOCMSG__ "BaseBar::InformControlsDead - do nothing" )
 	TRACE( _T("Warning - BaseBar::InformControlsDead called") );
 /* 	HWND CurrentChild;
 	HWND NextChild; 
@@ -4462,7 +4462,7 @@
 
 void BaseBar::StartDrag(wxPoint point, DlgDragType TypeOfDrag)
 {
-#pragma message( __LOCMSG__ "BaseBar::StartDrag - do nothing" )
+//#pragma message( __LOCMSG__ "BaseBar::StartDrag - do nothing" )
 	TRACE( _T("Warning - BaseBar::StartDrag called") );
 /*#ifdef STANDALONE
 #ifndef EXCLUDE_GALS
@@ -4565,7 +4565,7 @@
 // Message map - maintained by Class Wizard.
 
 BEGIN_EVENT_TABLE( BaseBar, wxWindow )
-#pragma message( __LOCMSG__ "Removed BaseBar message map" )
+//#pragma message( __LOCMSG__ "Removed BaseBar message map" )
 /*	ON_WM_NCCALCSIZE()
 	ON_WM_NCPAINT()
 	ON_WM_NCACTIVATE()
@@ -4618,7 +4618,7 @@
 
 static void PatB( wxDC &DC, INT32 x, INT32 y, INT32 dx, INT32 dy, wxColour &rgb )
 {
-#pragma message( __LOCMSG__ "PatB - do nothing" )
+//#pragma message( __LOCMSG__ "PatB - do nothing" )
 	TRACE( _T("Warning - PatB called") );
 /*	RECT rect;
 
@@ -4650,7 +4650,7 @@
 
 void BaseBar::Paint3dPlinth(wxDC* pDC, wxRect *rect, BOOL PlinthOut)
 {
-#pragma message( __LOCMSG__ "BaseBar::Paint3dPlinth - do nothing" )
+//#pragma message( __LOCMSG__ "BaseBar::Paint3dPlinth - do nothing" )
 	TRACE( _T("Warning - BaseBar::Paint3dPlinth called") );
 /*	if((LOBYTE(LOWORD(GetVersion()))) > 3 )
 	{
@@ -4767,7 +4767,7 @@
 ********************************************************************************************/
 
 
-#pragma message( __LOCMSG__ "BaseBar::OnDrawItem removed" )
+//#pragma message( __LOCMSG__ "BaseBar::OnDrawItem removed" )
 /*void BaseBar::OnDrawItem( INT32 nIDCtl, LPDRAWITEMSTRUCT lpDrawItemStruct )
 {
 	// owner drawn text button
@@ -4844,7 +4844,7 @@
 
 ********************************************************************************************/
 						
-#pragma message( __LOCMSG__ "BaseBar::OnParentNotify removed" )
+//#pragma message( __LOCMSG__ "BaseBar::OnParentNotify removed" )
 /*void BaseBar::OnParentNotify( UINT32 message, LPARAM lParam )
 {
 	if(message == WM_LBUTTONDOWN)
@@ -4885,7 +4885,7 @@
 
 ********************************************************************************************/
 
-#pragma message( __LOCMSG__ "BaseBar::OnKillFocus removed" )
+//#pragma message( __LOCMSG__ "BaseBar::OnKillFocus removed" )
 /*void BaseBar::OnKillFocus( wxWindow*Wnd )
 {
 	wxWindow::OnKillFocus(Wnd);
@@ -4908,7 +4908,7 @@
 ********************************************************************************************/
 
 
-#pragma message( __LOCMSG__ "BaseBar::OnSetFocus removed" )
+//#pragma message( __LOCMSG__ "BaseBar::OnSetFocus removed" )
 /*void BaseBar::OnSetFocus( wxWindow * Wnd )
 {
 	wxWindow::OnSetFocus(Wnd);
@@ -4930,7 +4930,7 @@
 
 ********************************************************************************************/
 
-#pragma message( __LOCMSG__ "BaseBar::OnActivateApp removed" )
+//#pragma message( __LOCMSG__ "BaseBar::OnActivateApp removed" )
 /*void BaseBar::OnActivateApp( BOOL  bActive, HTASK  hTask )
 {
 	
@@ -4965,7 +4965,7 @@
 
 ********************************************************************************************/
 
-#pragma message( __LOCMSG__ "BaseBar::OnActivate removed" )
+//#pragma message( __LOCMSG__ "BaseBar::OnActivate removed" )
 /*void BaseBar::OnActivate( UINT32 State, wxWindow* pWndOther, BOOL bMinimized ) 
 {
 	
@@ -5003,7 +5003,7 @@
 
 ********************************************************************************************/
 
-#pragma message( __LOCMSG__ "BaseBar::OnMouseActivate removed" )
+//#pragma message( __LOCMSG__ "BaseBar::OnMouseActivate removed" )
 /*INT32 BaseBar::OnMouseActivate( wxWindow* pDesktopWnd, UINT32 nHitTest, UINT32 message ) 
 {
 	
@@ -5052,7 +5052,7 @@
 
 ********************************************************************************************/
 
-#pragma message( __LOCMSG__ "BaseBar::OnDestroy removed" )
+//#pragma message( __LOCMSG__ "BaseBar::OnDestroy removed" )
 /*void BaseBar ::OnDestroy( )
 {
  
@@ -5104,7 +5104,7 @@
 
 ********************************************************************************************/
 
-#pragma message( __LOCMSG__ "BaseBar::ListLostFocus removed" )
+//#pragma message( __LOCMSG__ "BaseBar::ListLostFocus removed" )
 /*void  BaseBar::ListLostFocus(void)
 {
  
@@ -5126,7 +5126,7 @@
 
 ********************************************************************************************/
 
-#pragma message( __LOCMSG__ "BaseBar::ListSelChanged removed" )
+//#pragma message( __LOCMSG__ "BaseBar::ListSelChanged removed" )
 /*void  BaseBar::ListSelChanged(void)
 {
 //	if( pOp->IsKindOf(CC_RUNTIME_CLASS(SuperGallery)) )
@@ -5150,7 +5150,7 @@
 
 ********************************************************************************************/
 
-#pragma message( __LOCMSG__ "BaseBar::DoResize removed" )
+//#pragma message( __LOCMSG__ "BaseBar::DoResize removed" )
 /*LRESULT  BaseBar::DoResize(WPARAM , LPARAM)
 {
 	// ZZZZ
@@ -5226,7 +5226,7 @@
 
 ********************************************************************************************/
 
-#pragma message( __LOCMSG__ "BaseBar::GetBarSize removed" )
+//#pragma message( __LOCMSG__ "BaseBar::GetBarSize removed" )
 /*LRESULT  BaseBar::GetBarSize(WPARAM DockType , LPARAM ControlS)
 {
 	DockBarType ThisDock = (DockBarType) DockType;	
@@ -5275,7 +5275,7 @@
 {
 	wxRect ReturnRect(0,0,0,0);
 
-#pragma message( __LOCMSG__ "BaseBar::GetBarsDims - do nothing" )
+//#pragma message( __LOCMSG__ "BaseBar::GetBarsDims - do nothing" )
 	TRACE( _T("Warning - BaseBar::GetBarsDims called") );
 /*	OILDockingBar* FloatBars = GetMainFrame ()->GetDockBar (DockBarType);//DOCKBAR_FLOAT);
 	BOOL BigControls = FloatBars->IsBigControls ();
@@ -5323,7 +5323,7 @@
 
 ********************************************************************************************/
 
-#pragma message( __LOCMSG__ "BaseBar::GetBarSize removed" )
+//#pragma message( __LOCMSG__ "BaseBar::GetBarSize removed" )
 /*LRESULT BaseBar::SetControlFocus(WPARAM State, LPARAM Hwnd)
 {
 	if (State == TRUE)
@@ -5375,7 +5375,7 @@
 
 ********************************************************************************************/
 
-#pragma message( __LOCMSG__ "BaseBar::GetBarSize removed" )
+//#pragma message( __LOCMSG__ "BaseBar::GetBarSize removed" )
 /*LRESULT  BaseBar::StartControlDrag(WPARAM State, LPARAM Hwnd)
 {
 #ifdef STANDALONE
@@ -5446,7 +5446,7 @@
 #endif
 } */											 	
 
-#pragma message( __LOCMSG__ "BaseBar::GetBarSize removed" )
+//#pragma message( __LOCMSG__ "BaseBar::GetBarSize removed" )
 /*LRESULT  BaseBar::EndControlDrag(WPARAM State, LPARAM Hwnd)
 {
 	return 0;
@@ -5515,7 +5515,7 @@
 
 LRESULT BaseBar::WindowProc( UINT32 Message, WPARAM wParam, LPARAM lParam )
 {
-#pragma message( __LOCMSG__ "BaseBar::WindowProc - do nothing" )
+//#pragma message( __LOCMSG__ "BaseBar::WindowProc - do nothing" )
 	TRACE( _T("Warning - BaseBar::WindowProc called") );
 /*	// First send the message to the dialog manager 
 	DialogManager::SendDialogMessage(this,
@@ -5580,7 +5580,7 @@
 	Scope:		Protected
 
 ********************************************************************************************/
-#pragma message( __LOCMSG__ "BaseBar::OnNcCalcSize removed" )
+//#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
@@ -5619,7 +5619,7 @@
 	Scope:		Protected
 
 ********************************************************************************************/
-#pragma message( __LOCMSG__ "BaseBar::OnNcPaint removed" )
+//#pragma message( __LOCMSG__ "BaseBar::OnNcPaint removed" )
 /*void BaseBar::OnNcPaint()
 {
 	
@@ -5667,7 +5667,7 @@
 #define ROP_PSDPxax  0x00B8074AL
 
 
-#pragma message( __LOCMSG__ "BaseBar::PlotStretchedMaskedBitmap removed" )
+//#pragma message( __LOCMSG__ "BaseBar::PlotStretchedMaskedBitmap removed" )
 /*BOOL BaseBar::PlotStretchedMaskedBitmap(wxDC* destDC, CBitmap* srcBitmap,wxRect Pos)
 {
 	
@@ -5958,7 +5958,7 @@
 	// make sure that DrawCaption shows the correct title
 	SetLabel( pOp->GetName() );
 	
-#pragma message( __LOCMSG__ "Remove MSW frame redrawing stuff" )
+//#pragma message( __LOCMSG__ "Remove MSW frame redrawing stuff" )
 /*	UINT32 DrawFlags = DC_TEXT|DC_SMALLCAP;
 	
 	if(IsActive)
@@ -5991,7 +5991,7 @@
 
 void BaseBar::PaintDialogNonClient(BOOL IsActive)
 {
-#pragma message( __LOCMSG__ "BaseBar::PaintDialogNonClient - do nothing" )
+//#pragma message( __LOCMSG__ "BaseBar::PaintDialogNonClient - do nothing" )
 	TRACE( _T("Warning - BaseBar::PaintDialogNonClient called") );
 /*	// Get the System Frame Size
 	BorderWidth=wxSystemSettings::GetMetric(SM_CXFRAME);
@@ -6222,7 +6222,7 @@
 
 ********************************************************************************************/
 
-#pragma message( __LOCMSG__ "BaseBar::OnNcPaint removed" )
+//#pragma message( __LOCMSG__ "BaseBar::OnNcPaint removed" )
 /*BOOL BaseBar::OnNcActivate(BOOL IsActive)
 {
 	
@@ -6243,7 +6243,7 @@
 
 ********************************************************************************************/
 										 
-#pragma message( __LOCMSG__ "BaseBar::OnPaint removed" )
+//#pragma message( __LOCMSG__ "BaseBar::OnPaint removed" )
 /*void BaseBar::OnPaint()
 {
 	wxPaintDC  PaintDC(this); // device context for painting
@@ -6282,7 +6282,7 @@
 
 void BaseBar::PaintChicagoBorder()
 {
-#pragma message( __LOCMSG__ "BaseBar::PaintChicagoBorder - do nothing" )
+//#pragma message( __LOCMSG__ "BaseBar::PaintChicagoBorder - do nothing" )
 	TRACE( _T("Warning - BaseBar::PaintChicagoBorder called") );
 /*	wxRect WinRect( GetClientRect() );
 	wxRect ParWin( GetParent()->GetRect() );
@@ -6343,7 +6343,7 @@
 
 ********************************************************************************************/
 
-#pragma message( __LOCMSG__ "BaseBar::OnNcHitTest removed" )
+//#pragma message( __LOCMSG__ "BaseBar::OnNcHitTest removed" )
 /*UINT32 BaseBar::OnNcHitTest(wxPoint point)
 {
 
@@ -6434,7 +6434,7 @@
 
 ********************************************************************************************/
 
-#pragma message( __LOCMSG__ "BaseBar::OnNcRButtonDown removed" )
+//#pragma message( __LOCMSG__ "BaseBar::OnNcRButtonDown removed" )
 /*void BaseBar::OnNcRButtonDown(UINT32 nHitTest, wxPoint point)
 {
 } */
@@ -6454,7 +6454,7 @@
 
 ********************************************************************************************/
 
-#pragma message( __LOCMSG__ "BaseBar::OnNcHitTest removed" )
+//#pragma message( __LOCMSG__ "BaseBar::OnNcHitTest removed" )
 /*void BaseBar::OnNcHitTest(UINT32 nHitTest, wxPoint point)
 {
 
@@ -6477,7 +6477,7 @@
 
 ********************************************************************************************/
 
-#pragma message( __LOCMSG__ "BaseBar::OnLButtonDown removed" )
+//#pragma message( __LOCMSG__ "BaseBar::OnLButtonDown removed" )
 /*void BaseBar::OnLButtonDown(UINT32 nFlags, wxPoint point)
 {
 	// make sure we're not clicking on a disabled button
@@ -6526,7 +6526,7 @@
 
 ********************************************************************************************/
 
-#pragma message( __LOCMSG__ "BaseBar::OnMouseWheel removed" )
+//#pragma message( __LOCMSG__ "BaseBar::OnMouseWheel removed" )
 /*BOOL BaseBar::OnMouseWheel(UINT32 nFlags, short zDelta, wxPoint pt)
 {
 	TRACEUSER( "Matt", _T("MouseWheel Scroll In BaseBar!\n"));
@@ -6548,7 +6548,7 @@
 
 ********************************************************************************************/
 
-#pragma message( __LOCMSG__ "BaseBar::OnLButtonDblClk removed" )
+//#pragma message( __LOCMSG__ "BaseBar::OnLButtonDblClk removed" )
 /*void BaseBar::OnLButtonDblClk( UINT32 nFlags, wxPoint point )
 {
 	//MessageBeep(MB_OK);
@@ -6825,7 +6825,7 @@
 ********************************************************************************************/
 BOOL BaseBar::TidyUpControlDrag()
 {
-#pragma message( __LOCMSG__ "BaseBar::TidyUpControlDrag - do nothing" )
+//#pragma message( __LOCMSG__ "BaseBar::TidyUpControlDrag - do nothing" )
 	TRACE( _T("Warning - BaseBar::TidyUpControlDrag called") );
 /*	CtlDragState = NO_DRAG;
 	DragManagerOp::SetDragActive(FALSE);
@@ -6880,7 +6880,7 @@
 	InRecreate = FALSE;
 	CurrentBar = NULL;
 
-#pragma message( __LOCMSG__ "Remove DragManagerOp::SetDragActive usage" )
+//#pragma message( __LOCMSG__ "Remove DragManagerOp::SetDragActive usage" )
 //	DragManagerOp::SetDragActive(FALSE); 
 	return TRUE;
 }
@@ -6903,7 +6903,7 @@
 ********************************************************************************************/
 BOOL BaseBar::DropControl(wxPoint point, wxWindow* OverBar,BOOL InsertSeparator)
 {
-#pragma message( __LOCMSG__ "BaseBar::DropControl - do nothing" )
+//#pragma message( __LOCMSG__ "BaseBar::DropControl - do nothing" )
 	TRACE( _T("Warning - BaseBar::DropControl called") );
 /*	BOOL DeleteSeparator = FALSE;
 
@@ -7096,7 +7096,7 @@
 ********************************************************************************************/
 BOOL BaseBar::EndControlDrag(wxPoint point)
 {
-#pragma message( __LOCMSG__ "BaseBar::EndControlDrag - do nothing" )
+//#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;
@@ -7249,7 +7249,7 @@
 	SeeAlso:	-
 
 ********************************************************************************************/
-#pragma message( __LOCMSG__ "BaseBar::OnLButtonUp removed" )
+//#pragma message( __LOCMSG__ "BaseBar::OnLButtonUp removed" )
 /*void BaseBar::OnLButtonUp(UINT32 nFlags, wxPoint point)
 {
 	if(CtlDragState == DRAGGING)
@@ -7364,7 +7364,7 @@
 
 void BaseBar::ConvertToolbarOnStartup ()
 {
-#pragma message( __LOCMSG__ "BaseBar::ConvertToolbarOnStartup - do nothing" )
+//#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!");
 	
@@ -7411,7 +7411,7 @@
 
 ********************************************************************************************/
 
-#pragma message( __LOCMSG__ "BaseBar::MoveBar removed" )
+//#pragma message( __LOCMSG__ "BaseBar::MoveBar removed" )
 /*LRESULT BaseBar::MoveBar(WPARAM Dock, LPARAM Pos)
 {	
 	DockBarType NewDockType = (DockBarType)Dock;
@@ -7476,7 +7476,7 @@
 	SeeAlso:	-
 
 ********************************************************************************************/
-#pragma message( __LOCMSG__ "BaseBar::OnMouseMove removed" )
+//#pragma message( __LOCMSG__ "BaseBar::OnMouseMove removed" )
 /*void BaseBar::OnMouseMove(UINT32 Flags, wxPoint Point)
 {
 	if(CtlDragState == DRAGGING)
@@ -7532,7 +7532,7 @@
 
 void BaseBar::CacheAllDockRects()
 {
-#pragma message( __LOCMSG__ "BaseBar::CacheAllDockRects - do nothing" )
+//#pragma message( __LOCMSG__ "BaseBar::CacheAllDockRects - do nothing" )
 	TRACE( _T("Warning - BaseBar::CacheAllDockRects called") );
 /*	OILFixedDockingBar* DockBar;
 
@@ -7789,7 +7789,7 @@
 	}
 
 	// MFC DrawDragRect function
-#pragma message( __LOCMSG__ "Remove DrawDragRect usage" )
+//#pragma message( __LOCMSG__ "Remove DrawDragRect usage" )
 //	pDisplayDC->DrawDragRect( &Rect, NewSize, &OldRect, OldSize );
 	
 	/*
@@ -7847,7 +7847,7 @@
 
 void BaseBar::PaintXORDragRect(wxRect Rect,DockBarType DockBar)
 {
-#pragma message( __LOCMSG__ "Remove DC::PatBlt usage" )
+//#pragma message( __LOCMSG__ "Remove DC::PatBlt usage" )
 /*	DWORD dwRop = PATINVERT;
 
 	wxScreenDC	DisplayDC;
diff -Nuar xaralx-svn.orig//wxOil/bitmapgriddropdown.cpp xaralx-svn/wxOil/bitmapgriddropdown.cpp
--- xaralx-svn.orig//wxOil/bitmapgriddropdown.cpp	2010-08-07 14:12:21.000000000 -0400
+++ xaralx-svn/wxOil/bitmapgriddropdown.cpp	2010-08-07 15:37:37.123901499 -0400
@@ -122,7 +122,7 @@
 #include "grnddib.h"
 #include "ppbrush.h"
 #include "qualattr.h"
-
+#include <algorithm>
 
 
 
diff -Nuar xaralx-svn.orig//wxOil/ftfonts.cpp xaralx-svn/wxOil/ftfonts.cpp
--- xaralx-svn.orig//wxOil/ftfonts.cpp	2010-08-07 14:12:21.000000000 -0400
+++ xaralx-svn/wxOil/ftfonts.cpp	2010-08-07 15:37:37.122902407 -0400
@@ -122,7 +122,9 @@
 #include FT_TYPE1_TABLES_H
 
 #ifdef __WXGTK20__
+#define GSocket GlibSocket
 #include <gtk/gtk.h>
+#undef GSocket
 extern GtkWidget *wxGetRootWindow();
 #endif