Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Index: src/common/paws/pawscolorpromptwindow.cpp
- ===================================================================
- --- src/common/paws/pawscolorpromptwindow.cpp (Revision 6909)
- +++ src/common/paws/pawscolorpromptwindow.cpp (Arbeitskopie)
- @@ -122,12 +122,13 @@
- }
- else if (widget == cancelButton)
- {
- - if (action != NULL)
- + /*if (action != NULL) // commented this out, because by pressing "Cancel" array[0] was always set to "-1"
- {
- action->OnColorEntered("Cancel",0,-1);
- action = NULL;
- - }
- - parent->DeleteChild(this);
- + }*/
- + action = NULL;
- + parent->DeleteChild(this); //just delete the window
- return true;
- }
- return false;
- @@ -252,10 +253,10 @@
- w->SetBackground("Scaling Window Background");
- PawsManager::GetSingleton().SetCurrentFocusedWidget(w);
- - w->BringToTop(w);
- + w->SetAlwaysOnTop(true);
- w->Initialize(label, color, minColor, maxColor, action,name,param);
- - w->SetMovable(true);
- + w->SetMovable(false);
- return w;
- }
- Index: src/common/paws/pawsyesnobox.cpp
- ===================================================================
- --- src/common/paws/pawsyesnobox.cpp (Revision 6909)
- +++ src/common/paws/pawsyesnobox.cpp (Arbeitskopie)
- @@ -135,8 +135,10 @@
- dialog->SetText( text );
- dialog->SetID( yesID, noID );
- dialog->Show();
- - PawsManager::GetSingleton().SetModalWidget( dialog );
- + PawsManager::GetSingleton().SetCurrentFocusedWidget( dialog );
- dialog->MoveTo( (PawsManager::GetSingleton().GetGraphics2D()->GetWidth() - dialog->GetActualWidth(512) ) / 2,
- (PawsManager::GetSingleton().GetGraphics2D()->GetHeight() - dialog->GetActualHeight(256))/2 );
- + dialog->SetAlwaysOnTop(true);
- + dialog->SetMovable(false);
- return dialog;
- }
- Index: src/common/paws/pawsnumberpromptwindow.cpp
- ===================================================================
- --- src/common/paws/pawsnumberpromptwindow.cpp (Revision 6909)
- +++ src/common/paws/pawsnumberpromptwindow.cpp (Arbeitskopie)
- @@ -259,7 +259,9 @@
- w->UseBorder();
- w->SetTitle( "Amount", "Scaling Title Bar", "center", "no" );
- w->SetBackground("Scaling Window Background");
- - PawsManager::GetSingleton().SetModalWidget(w);
- + PawsManager::GetSingleton().SetCurrentFocusedWidget(w);
- w->Initialize(label, number, minNumber, maxNumber, action,name,param);
- + w->SetAlwaysOnTop(true);
- + w->SetMovable(false);
- return w;
- }
- Index: src/common/paws/pawsmanager.cpp
- ===================================================================
- --- src/common/paws/pawsmanager.cpp (Revision 6909)
- +++ src/common/paws/pawsmanager.cpp (Arbeitskopie)
- @@ -1081,7 +1088,7 @@
- return localization->Translate(orig);
- }
- -void PawsManager::CreateWarningBox( const char* message, pawsWidget* notify, bool modal )
- +void PawsManager::CreateWarningBox( const char* message, pawsWidget* notify, bool /*modal*/ )
- {
- pawsOkBox* ok = (pawsOkBox*)FindWidget("OkWindow");
- if ( !ok )
- @@ -1099,16 +1106,18 @@
- ok->SetText( message );
- ok->MoveTo( (graphics2D->GetWidth() - ok->GetActualWidth(512) ) / 2,
- (graphics2D->GetHeight() - ok->GetActualHeight(256))/2 );
- + ok->SetAlwaysOnTop(true);
- + ok->SetMovable(false);
- if ( notify )
- ok->SetNotify( notify );
- - if ( modal )
- - SetModalWidget( ok );
- +/* if ( modal )
- + SetModalWidget( ok ); */
- }
- -void PawsManager::CreateYesNoBox( const char* message, pawsWidget* notify, bool modal )
- +void PawsManager::CreateYesNoBox( const char* message, pawsWidget* notify, bool /*modal*/ )
- {
- pawsYesNoBox* yesNoBox = (pawsYesNoBox*)FindWidget("YesNoWindow");
- @@ -1127,9 +1136,11 @@
- (graphics2D->GetHeight() - yesNoBox->GetActualHeight(256))/2 );
- yesNoBox->SetText( Translate(message) );
- yesNoBox->Show();
- + yesNoBox->SetAlwaysOnTop(true);
- + yesNoBox->SetMovable(false);
- - if ( modal )
- - SetModalWidget(yesNoBox);
- +/* if ( modal )
- + SetModalWidget(yesNoBox); */
- if ( notify )
- yesNoBox->SetNotify(notify);
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
