#92535# BasicIDE: replace CancelClose button by Close button in MacroChooser dialog

4 files changed, 19 insertions, 31 deletions

diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 228143d185a0..1bc57388ebc9 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: macrodlg.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: tbe $ $Date: 2001-09-25 15:28:34 $
+ *  last change: $Author: tbe $ $Date: 2001-09-27 15:53:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -102,7 +102,7 @@ MacroChooser::MacroChooser( Window* pParnt, BOOL bScanBasics ) :
         aMacroFromTxT(      this,   IDEResId( RID_TXT_MACROFROM ) ),
         aBasicBox(          this,   IDEResId( RID_CTRL_LIB ) ),
         aRunButton(         this,   IDEResId( RID_PB_RUN ) ),
-        aCancelCloseButton( this,   IDEResId( RID_PB_CANCEL ) ),
+        aCloseButton(       this,   IDEResId( RID_PB_CLOSE ) ),
         aAssignButton(      this,   IDEResId( RID_PB_ASSIGN ) ),
         aEditButton(        this,   IDEResId( RID_PB_EDIT ) ),
         aNewDelButton(      this,   IDEResId( RID_PB_DEL ) ),
@@ -115,7 +115,6 @@ MacroChooser::MacroChooser( Window* pParnt, BOOL bScanBasics ) :
 
     nMode = MACROCHOOSER_ALL;
     bNewDelIsDel = TRUE;
-    bCancelCloseIsCancel = TRUE;
     //bAcceptDescription = TRUE;
 
     // Der Sfx fragt den BasicManager nicht, ob modified
@@ -127,7 +126,7 @@ MacroChooser::MacroChooser( Window* pParnt, BOOL bScanBasics ) :
     aMacroBox.SetHighlightRange(); // ueber ganze Breite selektieren
 
     aRunButton.SetClickHdl( LINK( this, MacroChooser, ButtonHdl ) );
-    aCancelCloseButton.SetClickHdl( LINK( this, MacroChooser, ButtonHdl ) );
+    aCloseButton.SetClickHdl( LINK( this, MacroChooser, ButtonHdl ) );
     aAssignButton.SetClickHdl( LINK( this, MacroChooser, ButtonHdl ) );
     aEditButton.SetClickHdl( LINK( this, MacroChooser, ButtonHdl ) );
     aNewDelButton.SetClickHdl( LINK( this, MacroChooser, ButtonHdl ) );
@@ -249,7 +248,6 @@ IMPL_LINK( MacroChooser, EditLoseFocusHdl, MultiLineEdit *, pEdit )
 /*
 IMPL_LINK_INLINE_START( MacroChooser, DescriptionModifyHdl, MultiLineEdit *, pEdit )
 {
-    CheckCancelClose();
     return 0;
 }
 IMPL_LINK_INLINE_END( MacroChooser, DescriptionModifyHdl, MultiLineEdit *, pEdit )
@@ -262,7 +260,7 @@ IMPL_LINK( MacroChooser, EditAccHdl, Accelerator *, pAcc )
     {
         bAcceptDescription = FALSE;
         UpdateFields();
-        aCancelCloseButton.GrabFocus();
+        aCloseButton.GrabFocus();
     }
 
     return 0;
@@ -312,7 +310,7 @@ short __EXPORT MacroChooser::Execute()
     UpdateFields();
 
     if ( StarBASIC::IsRunning() )
-        aCancelCloseButton.GrabFocus();
+        aCloseButton.GrabFocus();
 
     Window* pPrevDlgParent = Application::GetDefDialogParent();
     Application::SetDefDialogParent( this );
@@ -323,14 +321,6 @@ short __EXPORT MacroChooser::Execute()
     return nRet;
 }
 
-void MacroChooser::CheckCancelClose()
-{
-    if ( bCancelCloseIsCancel )
-    {
-        bCancelCloseIsCancel = FALSE;
-        aCancelCloseButton.SetText( String( IDEResId( RID_STR_CLOSE ) ) );
-    }
-}
 
 void MacroChooser::EnableButton( Button& rButton, BOOL bEnable )
 {
@@ -694,10 +684,9 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
         StoreMacroDescription();
         EndDialog( MACRO_OK_RUN );
     }
-    else if ( pButton == &aCancelCloseButton )
+    else if ( pButton == &aCloseButton )
     {
-        if ( !bCancelCloseIsCancel )
-            StoreMacroDescription();
+        StoreMacroDescription();
         EndDialog( MACRO_CLOSE );
     }
     else if ( ( pButton == &aEditButton ) || ( pButton == &aNewDelButton ) )
@@ -733,7 +722,6 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
                 }
                 CheckButtons();
                 UpdateFields();
-                CheckCancelClose();
                 //if ( aMacroBox.GetCurEntry() )    // OV-Bug ?
                 //  aMacroBox.Select( aMacroBox.GetCurEntry() );
             }
diff --git a/basctl/source/basicide/macrodlg.hrc b/basctl/source/basicide/macrodlg.hrc
index ce22646a31f8..004af7aed532 100644
--- a/basctl/source/basicide/macrodlg.hrc
+++ b/basctl/source/basicide/macrodlg.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: macrodlg.hrc,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: mh $ $Date: 2000-09-29 11:02:37 $
+ *  last change: $Author: tbe $ $Date: 2001-09-27 15:53:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,7 +76,7 @@
 #define RID_ED_MACRONAME                 5
 #define RID_TXT_DESCRIPTION              6
 #define RID_PB_RUN                       8
-#define RID_PB_CANCEL                    9
+#define RID_PB_CLOSE                     9
 #define RID_PB_EDIT                     10
 #define RID_PB_ORG                      11
 #define RID_PB_DEL                      12
diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx
index e4bf94271368..8dd25ba49169 100644
--- a/basctl/source/basicide/macrodlg.hxx
+++ b/basctl/source/basicide/macrodlg.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: macrodlg.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: tbe $ $Date: 2001-09-25 15:28:34 $
+ *  last change: $Author: tbe $ $Date: 2001-09-27 15:53:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -104,7 +104,7 @@ private:
     BasicTreeListBox        aBasicBox;
 
     PushButton              aRunButton;
-    CancelButton            aCancelCloseButton;
+    CancelButton            aCloseButton;
     PushButton              aAssignButton;
     PushButton              aEditButton;
     PushButton              aNewDelButton;
@@ -115,7 +115,6 @@ private:
     //ExtendedMultiLineEdit aDescrEdit;
 
     BOOL                bNewDelIsDel;
-    BOOL                bCancelCloseIsCancel;
     //BOOL              bAcceptDescription;
     BOOL                bForceStoreBasic;
 
@@ -138,7 +137,6 @@ private:
     //DECL_LINK( EditGotFocusHdl, MultiLineEdit * );
     //DECL_LINK( EditLoseFocusHdl, MultiLineEdit * );
     //DECL_LINK( EditAccHdl, Accelerator * );
-    void                CheckCancelClose();
 
     //void              SetInfo( SbxVariable* pVar );
     String              GetInfo( SbxVariable* pVar );
diff --git a/basctl/source/basicide/macrodlg.src b/basctl/source/basicide/macrodlg.src
index 23107964bd77..d62231d10cbb 100644
--- a/basctl/source/basicide/macrodlg.src
+++ b/basctl/source/basicide/macrodlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: macrodlg.src,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: tbe $ $Date: 2001-09-25 15:28:34 $
+ *  last change: $Author: tbe $ $Date: 2001-09-27 15:53:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -225,11 +225,13 @@ ModalDialog RID_MACROCHOOSER
         Text[ turkish ] = "Y�r�t";
         Text[ catalan ] = "Eje~cutar";
     };
-    CancelButton RID_PB_CANCEL
+    CancelButton RID_PB_CLOSE
     {
         Pos = MAP_APPFONT ( 231 , 23 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
+        Text = "Schlie�en" ;
+        Text [ ENGLISH ] = "Close" ;
     };
     PushButton RID_PB_ASSIGN
     {