summaryrefslogtreecommitdiff
path: root/wx+/grid.h
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2019-07-10 20:36:59 +0000
committerB Stack <bgstack15@gmail.com>2019-07-10 20:36:59 +0000
commitb3eda3ab537804cfa07cc257944b6fc69bec59a8 (patch)
treecc720d69d3ca68b64ed0aa79438177b6953469a1 /wx+/grid.h
parentMerge branch '10.12' into 'master' (diff)
parent10.13 (diff)
downloadFreeFileSync-b3eda3ab537804cfa07cc257944b6fc69bec59a8.tar.gz
FreeFileSync-b3eda3ab537804cfa07cc257944b6fc69bec59a8.tar.bz2
FreeFileSync-b3eda3ab537804cfa07cc257944b6fc69bec59a8.zip
Merge branch '10.13' into 'master'10.13
10.13 See merge request opensource-tracking/FreeFileSync!10
Diffstat (limited to 'wx+/grid.h')
-rw-r--r--wx+/grid.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/wx+/grid.h b/wx+/grid.h
index dbd33c7a..cecdfafe 100644
--- a/wx+/grid.h
+++ b/wx+/grid.h
@@ -347,8 +347,8 @@ private:
ColLabelWin* colLabelWin_;
MainWin* mainWin_;
- ScrollBarStatus showScrollbarX_ = SB_SHOW_AUTOMATIC;
- ScrollBarStatus showScrollbarY_ = SB_SHOW_AUTOMATIC;
+ ScrollBarStatus showScrollbarH_ = SB_SHOW_AUTOMATIC;
+ ScrollBarStatus showScrollbarV_ = SB_SHOW_AUTOMATIC;
int colLabelHeight_ = 0;
bool drawRowLabel_ = true;
@@ -362,6 +362,9 @@ private:
std::vector<ColAttributes> oldColAttributes_; //visible + nonvisible columns; use for conversion in setColumnConfig()/getColumnConfig() *only*!
size_t rowCountOld_ = 0; //at the time of last Grid::Refresh()
+
+ int scrollBarHeightH_ = 0; //optional: may not be known (yet)
+ int scrollBarWidthV_ = 0; //
};
//------------------------------------------------------------------------------------------------------------
bgstack15