From b654dbfa5f3e4a4d02f72023f7c5895635aa6396 Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:12:17 +0200 Subject: 3.18 --- ui/gui_generated.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'ui/gui_generated.h') diff --git a/ui/gui_generated.h b/ui/gui_generated.h index ef0462bc..13a4ea00 100644 --- a/ui/gui_generated.h +++ b/ui/gui_generated.h @@ -456,34 +456,42 @@ protected: wxPanel* m_panelCustomDeletionDir; wxTextCtrl* m_textCtrlCustomDelFolder; FfsDirPickerCtrl* m_dirPickerCustomDelFolder; - wxButton* m_buttonOK; wxButton* m_button16; - wxStaticBoxSizer* sbSizerSyncDirections; + + wxStaticBitmap* m_bitmapDatabase; + wxBoxSizer* sbSizerSyncDirections; wxStaticText* m_staticText21; wxStaticText* m_staticText31; wxStaticLine* m_staticline3; + wxBoxSizer* bSizerLeftOnly; wxStaticBitmap* m_bitmapLeftOnly; wxBitmapButton* m_bpButtonLeftOnly; + wxBoxSizer* bSizerRightOnly; wxStaticBitmap* m_bitmapRightOnly; wxBitmapButton* m_bpButtonRightOnly; + wxBoxSizer* bSizerLeftNewer; wxStaticBitmap* m_bitmapLeftNewer; wxBitmapButton* m_bpButtonLeftNewer; + wxBoxSizer* bSizerRightNewer; wxStaticBitmap* m_bitmapRightNewer; wxBitmapButton* m_bpButtonRightNewer; + wxBoxSizer* bSizerDifferent; wxStaticBitmap* m_bitmapDifferent; wxBitmapButton* m_bpButtonDifferent; + wxBoxSizer* bSizerConflict; wxStaticBitmap* m_bitmapConflict; wxBitmapButton* m_bpButtonConflict; + // Virtual event handlers, overide them in your derived class virtual void OnClose( wxCloseEvent& event ) { event.Skip(); } virtual void OnSyncAutomatic( wxCommandEvent& event ) { event.Skip(); } -- cgit