Added wxGridBagSizer, a grid sizer where item positions can be

specified and row/col spanning is allowed.

Updated docs, the layout sample, files.bkl, and updated makefiles.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-11-06 01:31:44 +00:00
parent 5d1000e7f1
commit 20b35a6916
32 changed files with 2198 additions and 259 deletions

View File

@@ -1046,6 +1046,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_fontmap.obj \
$(OBJS)\monolib_framecmn.obj \
$(OBJS)\monolib_gaugecmn.obj \
$(OBJS)\monolib_gbsizer.obj \
$(OBJS)\monolib_gdicmn.obj \
$(OBJS)\monolib_geometry.obj \
$(OBJS)\monolib_gifdecod.obj \
@@ -1240,6 +1241,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_fontmap.obj \
$(OBJS)\monolib_framecmn.obj \
$(OBJS)\monolib_gaugecmn.obj \
$(OBJS)\monolib_gbsizer.obj \
$(OBJS)\monolib_gdicmn.obj \
$(OBJS)\monolib_geometry.obj \
$(OBJS)\monolib_gifdecod.obj \
@@ -1432,6 +1434,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_fontmap.obj \
$(OBJS)\coredll_framecmn.obj \
$(OBJS)\coredll_gaugecmn.obj \
$(OBJS)\coredll_gbsizer.obj \
$(OBJS)\coredll_gdicmn.obj \
$(OBJS)\coredll_geometry.obj \
$(OBJS)\coredll_gifdecod.obj \
@@ -1626,6 +1629,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_fontmap.obj \
$(OBJS)\coredll_framecmn.obj \
$(OBJS)\coredll_gaugecmn.obj \
$(OBJS)\coredll_gbsizer.obj \
$(OBJS)\coredll_gdicmn.obj \
$(OBJS)\coredll_geometry.obj \
$(OBJS)\coredll_gifdecod.obj \
@@ -1818,6 +1822,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_fontmap.obj \
$(OBJS)\corelib_framecmn.obj \
$(OBJS)\corelib_gaugecmn.obj \
$(OBJS)\corelib_gbsizer.obj \
$(OBJS)\corelib_gdicmn.obj \
$(OBJS)\corelib_geometry.obj \
$(OBJS)\corelib_gifdecod.obj \
@@ -2012,6 +2017,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_fontmap.obj \
$(OBJS)\corelib_framecmn.obj \
$(OBJS)\corelib_gaugecmn.obj \
$(OBJS)\corelib_gbsizer.obj \
$(OBJS)\corelib_gdicmn.obj \
$(OBJS)\corelib_geometry.obj \
$(OBJS)\corelib_gifdecod.obj \
@@ -2204,6 +2210,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_fontmap.obj \
$(OBJS)\monodll_framecmn.obj \
$(OBJS)\monodll_gaugecmn.obj \
$(OBJS)\monodll_gbsizer.obj \
$(OBJS)\monodll_gdicmn.obj \
$(OBJS)\monodll_geometry.obj \
$(OBJS)\monodll_gifdecod.obj \
@@ -2398,6 +2405,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_fontmap.obj \
$(OBJS)\monodll_framecmn.obj \
$(OBJS)\monodll_gaugecmn.obj \
$(OBJS)\monodll_gbsizer.obj \
$(OBJS)\monodll_gdicmn.obj \
$(OBJS)\monodll_geometry.obj \
$(OBJS)\monodll_gifdecod.obj \
@@ -3642,6 +3650,11 @@ $(OBJS)\coredll_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_gbsizer.obj: ..\..\src\common\gbsizer.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_gdicmn.obj: ..\..\src\common\gdicmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -4763,6 +4776,11 @@ $(OBJS)\corelib_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_gbsizer.obj: ..\..\src\common\gbsizer.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_gdicmn.obj: ..\..\src\common\gdicmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -6139,6 +6157,11 @@ $(OBJS)\monodll_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_gbsizer.obj: ..\..\src\common\gbsizer.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_gdicmn.obj: ..\..\src\common\gdicmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -7611,6 +7634,11 @@ $(OBJS)\monolib_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_gbsizer.obj: ..\..\src\common\gbsizer.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_gdicmn.obj: ..\..\src\common\gdicmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**