Kaydet (Commit) 82495a68 authored tarafından Rüdiger Timm's avatar Rüdiger Timm

INTEGRATION: CWS ooo20031110 (1.4.22); FILE MERGED

2003/11/09 11:18:13 waratah 1.4.22.1: #i1858# change NULL to false on boolean, NULL is pointer type in gcc, gives warning
add class to friend keyword
üst 012c5a65
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: statemnt.hxx,v $ * $RCSfile: statemnt.hxx,v $
* *
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* last change: $Author: vg $ $Date: 2003-06-10 11:29:57 $ * last change: $Author: rt $ $Date: 2003-12-01 18:18:14 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -212,7 +212,7 @@ public: ...@@ -212,7 +212,7 @@ public:
{ {
bIsInReschedule = TRUE; bIsInReschedule = TRUE;
pLastFocusWindow = GetpApp()->GetFocusWindow(); pLastFocusWindow = GetpApp()->GetFocusWindow();
bWasDragManager = NULL /*!= DragManager::GetDragManager()*/; bWasDragManager = false /*!= DragManager::GetDragManager()*/;
bWasPopupMenu = NULL != PopupMenu::GetActivePopupMenu(); bWasPopupMenu = NULL != PopupMenu::GetActivePopupMenu();
bBasicWasRunning = StarBASIC::IsRunning(); bBasicWasRunning = StarBASIC::IsRunning();
bWasExecuting = bExecuting; bWasExecuting = bExecuting;
...@@ -351,7 +351,7 @@ public: ...@@ -351,7 +351,7 @@ public:
class StatementCommand : public StatementList // Befehl ausfhren (wintree, resetaplication ...) class StatementCommand : public StatementList // Befehl ausfhren (wintree, resetaplication ...)
{ {
friend ImplRemoteControl; friend class ImplRemoteControl;
protected: protected:
USHORT nMethodId; USHORT nMethodId;
USHORT nParams; USHORT nParams;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment