Diff of /trunk/pwsafe/pwsafe/src/ui/wxWidgets/SafeCombinationCtrl.h [r5104] .. [r5105] Maximize Restore

  Switch to side-by-side view

--- a/trunk/pwsafe/pwsafe/src/ui/wxWidgets/SafeCombinationCtrl.h
+++ b/trunk/pwsafe/pwsafe/src/ui/wxWidgets/SafeCombinationCtrl.h
@@ -23,12 +23,21 @@
 
 public:
   CSafeCombinationCtrl(wxWindow* parent, wxWindowID textCtrlID = wxID_ANY, StringX* valPtr = 0,
-                        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize);
+                        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize)
+    : wxBoxSizer(wxHORIZONTAL), textCtrl(0)
+    {Init(parent, textCtrlID, valPtr, pos, size);}
+  // Following c'tor for code autogenerated by DialogBlocks
+ CSafeCombinationCtrl(wxWindow* parent, wxWindowID textCtrlID, const wxString &, const wxPoint& pos, const wxSize& size, int)
+   : wxBoxSizer(wxHORIZONTAL), textCtrl(0)
+    {Init(parent, textCtrlID, NULL, pos, size);}
+  // following common c'tor code for both above
+  void Init(wxWindow* parent, wxWindowID textCtrlID, StringX* valPtr, const wxPoint& pos, const wxSize& size);
   ~CSafeCombinationCtrl();
   
   StringX GetCombination() const;
   void SetValidatorTarget(StringX* str);
   void SelectCombinationText() const;
+  void AllowEmptyCombinationOnce(); // for YubiKey, one-shot for use in YubiBtn event handlers
 
 private:
   wxTextCtrl* textCtrl;