[wxmax commit] r163 - in trunk/wx.mod: wxpickerbase.mod wxstaticbox.mod wxstaticboxsizer.mod wxstaticboxsizer.mo...
codesite...@google.com
Date: Thu Dec 13 12:38:48 2007
New Revision: 163
Added:
trunk/wx.mod/wxstaticboxsizer.mod/
trunk/wx.mod/wxstaticboxsizer.mod/common.bmx
trunk/wx.mod/wxstaticboxsizer.mod/doc/
trunk/wx.mod/wxstaticboxsizer.mod/glue.cpp
trunk/wx.mod/wxstaticboxsizer.mod/glue.h
trunk/wx.mod/wxstaticboxsizer.mod/wxstaticboxsizer.bmx
Modified:
trunk/wx.mod/wxpickerbase.mod/common.bmx
trunk/wx.mod/wxpickerbase.mod/glue.cpp
trunk/wx.mod/wxpickerbase.mod/glue.h
trunk/wx.mod/wxpickerbase.mod/wxpickerbase.bmx
trunk/wx.mod/wxstaticbox.mod/wxstaticbox.bmx
trunk/wx.mod/wxwindow.mod/common.bmx
trunk/wx.mod/wxwindow.mod/glue.cpp
trunk/wx.mod/wxwindow.mod/glue.h
trunk/wx.mod/wxwindow.mod/wxwindow.bmx
Log:
Implemented wxPickerBase.
Implemented wxStaticBoxSizer and remaining wxFlexGridSizer methods.
Modified: trunk/wx.mod/wxpickerbase.mod/common.bmx
==============================================================================
--- trunk/wx.mod/wxpickerbase.mod/common.bmx (original)
+++ trunk/wx.mod/wxpickerbase.mod/common.bmx Thu Dec 13 12:38:48 2007
@@ -45,6 +45,19 @@
Extern
+ Function bmx_wxpickerbase_setinternalmargin(handle:Byte Ptr, margin:Int)
+ Function bmx_wxpickerbase_getinternalmargin:Int(handle:Byte Ptr)
+ Function bmx_wxpickerbase_settextctrlproportion(handle:Byte Ptr, prop:Int)
+ Function bmx_wxpickerbase_setpickerctrlproportion(handle:Byte Ptr, prop:Int)
+ Function bmx_wxpickerbase_gettextctrlproportion:Int(handle:Byte Ptr)
+ Function bmx_wxpickerbase_getpickerctrlproportion:Int(handle:Byte Ptr)
+ Function bmx_wxpickerbase_hastextctrl:Int(handle:Byte Ptr)
+ Function bmx_wxpickerbase_gettextctrl:Byte Ptr(handle:Byte Ptr)
+ Function bmx_wxpickerbase_istextctrlgrowable:Int(handle:Byte Ptr)
+ Function bmx_wxpickerbase_setpickerctrlgrowable(handle:Byte Ptr, grow:Int)
+ Function bmx_wxpickerbase_settextctrlgrowable(handle:Byte Ptr, grow:Int)
+ Function bmx_wxpickerbase_ispickerctrlgrowable:Int(handle:Byte Ptr)
+
End Extern
Modified: trunk/wx.mod/wxpickerbase.mod/glue.cpp
==============================================================================
--- trunk/wx.mod/wxpickerbase.mod/glue.cpp (original)
+++ trunk/wx.mod/wxpickerbase.mod/glue.cpp Thu Dec 13 12:38:48 2007
@@ -28,4 +28,52 @@
// *********************************************
+void bmx_wxpickerbase_setinternalmargin(wxPickerBase * picker, int
margin) {
+ picker->SetInternalMargin(margin);
+}
+
+int bmx_wxpickerbase_getinternalmargin(wxPickerBase * picker) {
+ return picker->GetInternalMargin();
+}
+
+void bmx_wxpickerbase_settextctrlproportion(wxPickerBase * picker, int
prop) {
+ picker->SetTextCtrlProportion(prop);
+}
+
+void bmx_wxpickerbase_setpickerctrlproportion(wxPickerBase * picker,
int prop) {
+ picker->SetPickerCtrlProportion(prop);
+}
+
+int bmx_wxpickerbase_gettextctrlproportion(wxPickerBase * picker) {
+ return picker->GetTextCtrlProportion();
+}
+
+int bmx_wxpickerbase_getpickerctrlproportion(wxPickerBase * picker) {
+ return picker->GetPickerCtrlProportion();
+}
+
+bool bmx_wxpickerbase_hastextctrl(wxPickerBase * picker) {
+ return picker->HasTextCtrl();
+}
+
+wxTextCtrl * bmx_wxpickerbase_gettextctrl(wxPickerBase * picker) {
+ return picker->GetTextCtrl();
+}
+
+bool bmx_wxpickerbase_istextctrlgrowable(wxPickerBase * picker) {
+ return picker->IsTextCtrlGrowable();
+}
+
+void bmx_wxpickerbase_setpickerctrlgrowable(wxPickerBase * picker,
bool grow) {
+ picker->SetPickerCtrlGrowable(grow);
+}
+
+void bmx_wxpickerbase_settextctrlgrowable(wxPickerBase * picker, bool
grow) {
+ picker->SetTextCtrlGrowable(grow);
+}
+
+bool bmx_wxpickerbase_ispickerctrlgrowable(wxPickerBase * picker) {
+ return picker->IsPickerCtrlGrowable();
+}
+
Modified: trunk/wx.mod/wxpickerbase.mod/glue.h
==============================================================================
--- trunk/wx.mod/wxpickerbase.mod/glue.h (original)
+++ trunk/wx.mod/wxpickerbase.mod/glue.h Thu Dec 13 12:38:48 2007
@@ -21,6 +21,7 @@
*/
#include "wxglue.h"
+#include "wx/pickerbase.h"
//class MaxNotebook;
@@ -28,6 +29,18 @@
#include <blitz.h>
+ void bmx_wxpickerbase_setinternalmargin(wxPickerBase * picker, int margin);
+ int bmx_wxpickerbase_getinternalmargin(wxPickerBase * picker);
+ void bmx_wxpickerbase_settextctrlproportion(wxPickerBase * picker,
int prop);
+ void bmx_wxpickerbase_setpickerctrlproportion(wxPickerBase * picker,
int prop);
+ int bmx_wxpickerbase_gettextctrlproportion(wxPickerBase * picker);
+ int bmx_wxpickerbase_getpickerctrlproportion(wxPickerBase * picker);
+ bool bmx_wxpickerbase_hastextctrl(wxPickerBase * picker);
+ wxTextCtrl * bmx_wxpickerbase_gettextctrl(wxPickerBase * picker);
+ bool bmx_wxpickerbase_istextctrlgrowable(wxPickerBase * picker);
+ void bmx_wxpickerbase_setpickerctrlgrowable(wxPickerBase * picker,
bool grow);
+ void bmx_wxpickerbase_settextctrlgrowable(wxPickerBase * picker, bool grow);
+ bool bmx_wxpickerbase_ispickerctrlgrowable(wxPickerBase * picker);
}
Modified: trunk/wx.mod/wxpickerbase.mod/wxpickerbase.bmx
==============================================================================
--- trunk/wx.mod/wxpickerbase.mod/wxpickerbase.bmx (original)
+++ trunk/wx.mod/wxpickerbase.mod/wxpickerbase.bmx Thu Dec 13 12:38:48 2007
@@ -59,40 +59,99 @@
End Rem
Type wxPickerBase Extends wxControl Abstract
+ Rem
+ bbdoc: Sets the margin (in pixel) between the picker and the text control.
+ about: This method can be used only when HasTextCtrl returns true.
+ End Rem
Method SetInternalMargin(margin:Int)
+ bmx_wxpickerbase_setinternalmargin(wxObjectPtr, margin)
End Method
+ Rem
+ bbdoc: Returns the margin (in pixel) between the picker and the text control.
+ about: This method can be used only when HasTextCtrl returns true.
+ End Rem
Method GetInternalMargin:Int()
+ Return bmx_wxpickerbase_getinternalmargin(wxObjectPtr)
End Method
+ Rem
+ bbdoc: Sets the proportion value of the text control.
+ about: This method can be used only when HasTextCtrl returns true.
+ End Rem
Method SetTextCtrlProportion(prop:Int)
+ bmx_wxpickerbase_settextctrlproportion(wxObjectPtr, prop)
End Method
+ Rem
+ bbdoc: Sets the proportion value of the picker.
+ End Rem
Method SetPickerCtrlProportion(prop:Int)
+ bmx_wxpickerbase_setpickerctrlproportion(wxObjectPtr, prop)
End Method
+ Rem
+ bbdoc: Returns the proportion value of the text control.
+ about: This method can be used only when HasTextCtrl returns true.
+ End Rem
Method GetTextCtrlProportion:Int()
+ Return bmx_wxpickerbase_gettextctrlproportion(wxObjectPtr)
End Method
+ Rem
+ bbdoc: Returns the proportion value of the picker.
+ End Rem
Method GetPickerCtrlProportion:Int()
+ Return bmx_wxpickerbase_getpickerctrlproportion(wxObjectPtr)
End Method
+ Rem
+ bbdoc: Returns true if this window has a valid text control (i.e. if
the wxPB_USE_TEXTCTRL style was given when creating this control).
+ End Rem
Method HasTextCtrl:Int()
+ Return bmx_wxpickerbase_hastextctrl(wxObjectPtr)
End Method
+ Rem
+ bbdoc: Returns a pointer to the text control handled by this window
or Null if the wxPB_USE_TEXTCTRL style was not specified when this
control was created.
+ about: Very important: the contents of the text control could be
containing an invalid
+ representation of the entity which can be chosen through the picker
(e.g. the user entered an
+ invalid colour syntax because of a typo). Thus you should never parse
the content of the
+ textctrl to get the user's input; rather use the derived-class getter (e.g.
+ wxColourPickerCtrl::GetColour, wxFilePickerCtrl::GetPath, etc).
+ End Rem
Method GetTextCtrl:wxTextCtrl()
+ Return wxTextCtrl._create(bmx_wxpickerbase_gettextctrl(wxObjectPtr))
End Method
+ Rem
+ bbdoc: Returns true if the text control is growable.
+ about: This method can be used only when HasTextCtrl returns true.
+ End Rem
Method IsTextCtrlGrowable:Int()
+ Return bmx_wxpickerbase_istextctrlgrowable(wxObjectPtr)
End Method
+ Rem
+ bbdoc: Sets the picker control as growable when grow is true.
+ End Rem
Method SetPickerCtrlGrowable(grow:Int = True)
+ bmx_wxpickerbase_setpickerctrlgrowable(wxObjectPtr, grow)
End Method
+ Rem
+ bbdoc: Sets the text control as growable when grow is true.
+ about: This method can be used only when HasTextCtrl returns true.
+ End Rem
Method SetTextCtrlGrowable(grow:Int = True)
+ bmx_wxpickerbase_settextctrlgrowable(wxObjectPtr, grow)
End Method
+ Rem
+ bbdoc: Returns true if the picker control is growable.
+ End Rem
Method IsPickerCtrlGrowable:Int()
+ Return bmx_wxpickerbase_ispickerctrlgrowable(wxObjectPtr)
End Method
End Type
Modified: trunk/wx.mod/wxstaticbox.mod/wxstaticbox.bmx
==============================================================================
--- trunk/wx.mod/wxstaticbox.mod/wxstaticbox.bmx (original)
+++ trunk/wx.mod/wxstaticbox.mod/wxstaticbox.bmx Thu Dec 13 12:38:48 2007
@@ -63,6 +63,25 @@
End Rem
Type wxStaticBox Extends wxControl
+ ' soft linking
+ Function _create:wxStaticBox(wxObjectPtr:Byte Ptr)
+ If wxObjectPtr Then
+ Local this:wxStaticBox = New wxStaticBox
+ this.wxObjectPtr = wxObjectPtr
+ Return this
+ End If
+ End Function
+
+ Function _find:wxStaticBox(wxObjectPtr:Byte Ptr)
+ If wxObjectPtr Then
+ Local window:wxStaticBox = wxStaticBox(wxfind(wxObjectPtr))
+ If Not window Then
+ Return wxStaticBox._create(wxObjectPtr)
+ End If
+ Return window
+ End If
+ End Function
+
Rem
bbdoc: Constructor, creating and showing a static box.
End Rem
Added: trunk/wx.mod/wxstaticboxsizer.mod/common.bmx
==============================================================================
--- (empty file)
+++ trunk/wx.mod/wxstaticboxsizer.mod/common.bmx Thu Dec 13 12:38:48 2007
@@ -0,0 +1,52 @@
+' Copyright (c) 2007 Bruce A Henderson
+'
+' Permission is hereby granted, free of charge, to any person
obtaining a copy
+' of this software and associated documentation files
(the "Software"), to deal
+' in the Software without restriction, including without limitation
the rights
+' to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+' copies of the Software, and to permit persons to whom the Software is
+' furnished to do so, subject to the following conditions:
+'
+' The above copyright notice and this permission notice shall be
included in
+' all copies or substantial portions of the Software.
+'
+' THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR
+' IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+' FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
SHALL THE
+' AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+' LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM,
+' OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN
+' THE SOFTWARE.
+'
+SuperStrict
+
+Import wx.wx
+Import wx.wxWindow
+Import wx.wxStaticBox
+Import BRL.Blitz
+
+
+' headers :-)
+?linux
+Import "../lib/linux/wx/include/gtk2-unicode-release-static/*.h"
+Import "../include/*.h"
+?win32
+Import "../lib/win32/mswu/*.h"
+Import "../include/*.h"
+?macosppc
+Import "../lib/macosppc/wx/include/mac-unicode-release-static/*.h"
+Import "../include/*.h"
+?macosx86
+Import "../lib/macosx86/wx/include/mac-unicode-release-static/*.h"
+Import "../include/*.h"
+?
+
+Import "glue.cpp"
+
+Extern
+
+ Function bmx_wxstaticboxsizer_createsizer:Byte Ptr(handle:Object,
orient:Int, parent:Byte Ptr, label:String)
+ Function bmx_wxstaticboxsizer_createsizerwithbox:Byte
Ptr(handle:Object, box:Byte Ptr, orient:Int)
+ Function bmx_wxstaticboxsizer_getstaticbox:Byte Ptr(handle:Byte Ptr)
+
+End Extern
Added: trunk/wx.mod/wxstaticboxsizer.mod/glue.cpp
==============================================================================
--- (empty file)
+++ trunk/wx.mod/wxstaticboxsizer.mod/glue.cpp Thu Dec 13 12:38:48 2007
@@ -0,0 +1,57 @@
+/*
+ Copyright (c) 2007 Bruce A Henderson
+
+ Permission is hereby granted, free of charge, to any person
obtaining a copy
+ of this software and associated documentation files
(the "Software"), to deal
+ in the Software without restriction, including without limitation
the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be
included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN
+ THE SOFTWARE.
+*/
+
+#include "glue.h"
+
+// ---------------------------------------------------------------------------------------
+
+MaxStaticBoxSizer::MaxStaticBoxSizer(BBObject * handle, int orient,
wxWindow * parent, const wxString& label)
+ : maxHandle(handle), wxStaticBoxSizer(orient, parent, label)
+{
+ wxbind(this, handle);
+}
+
+MaxStaticBoxSizer::MaxStaticBoxSizer(BBObject * handle, wxStaticBox *
box, int orient)
+ : maxHandle(handle), wxStaticBoxSizer(box, orient)
+{
+ wxbind(this, handle);
+}
+
+MaxStaticBoxSizer::~MaxStaticBoxSizer() {
+ wxunbind(this);
+}
+
+
+// *********************************************
+
+MaxStaticBoxSizer * bmx_wxstaticboxsizer_createsizer(BBObject *
handle, int orient, wxWindow * parent, BBString * label) {
+ return new MaxStaticBoxSizer(handle, orient, parent, wxStringFromBBString(label));
+}
+
+MaxStaticBoxSizer * bmx_wxstaticboxsizer_createsizerwithbox(BBObject *
handle, wxStaticBox * box, int orient) {
+ return new MaxStaticBoxSizer(handle, box, orient);
+}
+
+wxStaticBox * bmx_wxstaticboxsizer_getstaticbox(wxStaticBoxSizer *
sizer) {
+ return sizer->GetStaticBox();
+}
+
Added: trunk/wx.mod/wxstaticboxsizer.mod/glue.h
==============================================================================
--- (empty file)
+++ trunk/wx.mod/wxstaticboxsizer.mod/glue.h Thu Dec 13 12:38:48 2007
@@ -0,0 +1,50 @@
+/*
+ Copyright (c) 2007 Bruce A Henderson
+
+ Permission is hereby granted, free of charge, to any person
obtaining a copy
+ of this software and associated documentation files
(the "Software"), to deal
+ in the Software without restriction, including without limitation
the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be
included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN
+ THE SOFTWARE.
+*/
+
+#include "wxglue.h"
+#include "wx/sizer.h"
+
+class MaxStaticBoxSizer;
+
+extern "C" {
+
+#include <blitz.h>
+
+ MaxStaticBoxSizer * bmx_wxstaticboxsizer_createsizer(BBObject *
handle, int orient, wxWindow * parent, BBString * label);
+ MaxStaticBoxSizer * bmx_wxstaticboxsizer_createsizerwithbox(BBObject
* handle, wxStaticBox * box, int orient);
+ wxStaticBox * bmx_wxstaticboxsizer_getstaticbox(wxStaticBoxSizer * sizer);
+
+}
+
+// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+class MaxStaticBoxSizer : public wxStaticBoxSizer
+{
+public:
+ MaxStaticBoxSizer(BBObject * handle, int orient, wxWindow * parent,
const wxString& label);
+ MaxStaticBoxSizer(BBObject * handle, wxStaticBox * box, int orient);
+ ~ MaxStaticBoxSizer();
+
+private:
+ BBObject * maxHandle;
+
+};
Added: trunk/wx.mod/wxstaticboxsizer.mod/wxstaticboxsizer.bmx
==============================================================================
--- (empty file)
+++ trunk/wx.mod/wxstaticboxsizer.mod/wxstaticboxsizer.bmx Thu Dec 13
12:38:48 2007
@@ -0,0 +1,81 @@
+' Copyright (c) 2007 Bruce A Henderson
+'
+' Permission is hereby granted, free of charge, to any person
obtaining a copy
+' of this software and associated documentation files
(the "Software"), to deal
+' in the Software without restriction, including without limitation
the rights
+' to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+' copies of the Software, and to permit persons to whom the Software is
+' furnished to do so, subject to the following conditions:
+'
+' The above copyright notice and this permission notice shall be
included in
+' all copies or substantial portions of the Software.
+'
+' THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR
+' IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+' FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
SHALL THE
+' AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+' LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM,
+' OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN
+' THE SOFTWARE.
+'
+SuperStrict
+
+Module wx.wxStaticBoxSizer
+
+ModuleInfo "Version: 1.00"
+ModuleInfo "License: MIT"
+ModuleInfo "Author: Bruce A Henderson"
+ModuleInfo "Copyright: (c) 2007 Bruce A Henderson"
+ModuleInfo "Modserver: BRL"
+
+?linux
+ModuleInfo "CC_OPTS: -D__WXGTK__"
+ModuleInfo "CC_OPTS: -D_FILE_OFFSET_BITS=64"
+ModuleInfo "CC_OPTS: -D_LARGE_FILES"
+ModuleInfo "CC_OPTS: -DWX_PRECOMP"
+?win32
+ModuleInfo "CC_OPTS: -DHAVE_W32API_H"
+ModuleInfo "CC_OPTS: -D__WXMSW__"
+ModuleInfo "CC_OPTS: -D_UNICODE"
+ModuleInfo "CC_OPTS: -DUNICODE"
+?macos
+ModuleInfo "CC_OPTS: -D__WXMAC__"
+ModuleInfo "CC_OPTS: -D_FILE_OFFSET_BITS=64"
+ModuleInfo "CC_OPTS: -D_LARGE_FILES"
+ModuleInfo "CC_OPTS: -DWX_PRECOMP"
+?
+
+Import "common.bmx"
+
+Rem
+bbdoc: wxStaticBoxSizer is a sizer derived from wxBoxSizer but adds a
static box around the sizer.
+about: This static box may be either created independently or the
sizer may create it itself as a
+convenience. In any case, the sizer owns the wxStaticBox control and
will delete it if it is deleted.
+End Rem
+Type wxStaticBoxSizer Extends wxBoxSizer
+
+ Function CreateStaticBoxSizer:wxStaticBoxSizer(orient:Int,
parent:wxWindow, label:String = "")
+ Return New wxStaticBoxSizer.CreateSizer(orient, parent, label)
+ End Function
+
+ Function
CreateStaticBoxSizerWithBox:wxStaticBoxSizer(box:wxStaticBox, orient:Int)
+ Return New wxStaticBoxSizer.CreateSizerWithBox(box, orient)
+ End Function
+
+ Method CreateSizer:wxStaticBoxSizer(orient:Int, parent:wxWindow,
label:String = "")
+ wxSizerPtr = bmx_wxstaticboxsizer_createsizer(Self, orient,
parent.wxObjectPtr, label)
+ Return Self
+ End Method
+
+ Method CreateSizerWithBox:wxStaticBoxSizer(box:wxStaticBox, orient:Int)
+ wxSizerPtr = bmx_wxstaticboxsizer_createsizerwithbox(Self,
box.wxObjectPtr, orient)
+ Return Self
+ End Method
+
+ Method GetStaticBox:wxStaticBox()
+ Return wxStaticBox._find(bmx_wxstaticboxsizer_getstaticbox(wxSizerPtr))
+ End Method
+
+End Type
+
+
Modified: trunk/wx.mod/wxwindow.mod/common.bmx
==============================================================================
--- trunk/wx.mod/wxwindow.mod/common.bmx (original)
+++ trunk/wx.mod/wxwindow.mod/common.bmx Thu Dec 13 12:38:48 2007
@@ -226,7 +226,14 @@
Function bmx_wxsizer_fit(handle:Byte Ptr, window:Byte Ptr)
Function bmx_wxsizer_fitsize(handle:Byte Ptr, window:Byte Ptr, w:Int
Ptr, h:Int Ptr)
Function bmx_wxboxsizer_getorientation:Int(handle:Byte Ptr)
-
+
+ Function bmx_wxflexgridsizer_getflexibledirection:Int(handle:Byte Ptr)
+ Function bmx_wxflexgridsizer_getnonflexiblegrowmode:Int(handle:Byte Ptr)
+ Function bmx_wxflexgridsizer_removegrowablecol(handle:Byte Ptr, idx:Int)
+ Function bmx_wxflexgridsizer_removegrowablerow(handle:Byte Ptr, idx:Int)
+ Function bmx_wxflexgridsizer_setflexibledirection(handle:Byte Ptr, direction:Int)
+ Function bmx_wxflexgridsizer_setnonflexiblegrowmode(handle:Byte Ptr, mode:Int)
+
Function bmx_wxtooltip_enable(flag:Int)
Function bmx_wxtooltip_setdelay(msecs:Int)
Modified: trunk/wx.mod/wxwindow.mod/glue.cpp
==============================================================================
--- trunk/wx.mod/wxwindow.mod/glue.cpp (original)
+++ trunk/wx.mod/wxwindow.mod/glue.cpp Thu Dec 13 12:38:48 2007
@@ -821,6 +821,33 @@
return sizer->GetOrientation();
}
+int bmx_wxflexgridsizer_getflexibledirection(wxFlexGridSizer * sizer) {
+ return sizer->GetFlexibleDirection();
+}
+
+int bmx_wxflexgridsizer_getnonflexiblegrowmode(wxFlexGridSizer *
sizer) {
+ return sizer->GetNonFlexibleGrowMode();
+}
+
+void bmx_wxflexgridsizer_removegrowablecol(wxFlexGridSizer * sizer,
int idx) {
+ sizer->RemoveGrowableCol(idx);
+}
+
+void bmx_wxflexgridsizer_removegrowablerow(wxFlexGridSizer * sizer,
int idx) {
+ sizer->RemoveGrowableRow(idx);
+}
+
+void bmx_wxflexgridsizer_setflexibledirection(wxFlexGridSizer * sizer,
int direction) {
+ sizer->SetFlexibleDirection(direction);
+}
+
+void bmx_wxflexgridsizer_setnonflexiblegrowmode(wxFlexGridSizer *
sizer, wxFlexSizerGrowMode mode) {
+ sizer->SetNonFlexibleGrowMode(mode);
+}
+
+// *********************************************
+
+
void bmx_wxtooltip_enable(bool flag) {
wxToolTip::Enable(flag);
}
Modified: trunk/wx.mod/wxwindow.mod/glue.h
==============================================================================
--- trunk/wx.mod/wxwindow.mod/glue.h (original)
+++ trunk/wx.mod/wxwindow.mod/glue.h Thu Dec 13 12:38:48 2007
@@ -215,6 +215,13 @@
void bmx_wxsizer_fitsize(wxSizer * sizer, wxWindow * window, int * w,
int * h);
int bmx_wxboxsizer_getorientation(wxBoxSizer * sizer);
+ int bmx_wxflexgridsizer_getflexibledirection(wxFlexGridSizer * sizer);
+ int bmx_wxflexgridsizer_getnonflexiblegrowmode(wxFlexGridSizer * sizer);
+ void bmx_wxflexgridsizer_removegrowablecol(wxFlexGridSizer * sizer,
int idx);
+ void bmx_wxflexgridsizer_removegrowablerow(wxFlexGridSizer * sizer,
int idx);
+ void bmx_wxflexgridsizer_setflexibledirection(wxFlexGridSizer *
sizer, int direction);
+ void bmx_wxflexgridsizer_setnonflexiblegrowmode(wxFlexGridSizer *
sizer, wxFlexSizerGrowMode mode);
+
void bmx_wxtooltip_enable(bool flag);
void bmx_wxtooltip_setdelay(long msecs);
Modified: trunk/wx.mod/wxwindow.mod/wxwindow.bmx
==============================================================================
--- trunk/wx.mod/wxwindow.mod/wxwindow.bmx (original)
+++ trunk/wx.mod/wxwindow.mod/wxwindow.bmx Thu Dec 13 12:38:48 2007
@@ -2001,15 +2001,6 @@
End Type
Rem
-bbdoc: wxStaticBoxSizer is a sizer derived from wxBoxSizer but adds a
static box around the sizer.
-about: This static box may be either created independently or the
sizer may create it itself as a
-convenience. In any case, the sizer owns the wxStaticBox control and
will delete it if it is deleted.
-End Rem
-Type wxStatixBoxSizer Extends wxBoxSizer
-
-End Type
-
-Rem
bbdoc: A grid sizer is a sizer which lays out its children in a
two-dimensional table with all table fields having the same size, i.e.
the width of each field is the width of the widest child, the height of
each field is the height of the tallest child.
End Rem
Type wxGridSizer Extends wxSizer
@@ -2129,39 +2120,56 @@
End Method
Rem
- bbdoc:
+ bbdoc: Returns a wxOrientation value that specifies whether the sizer
flexibly resizes its columns, rows, or both (default).
End Rem
Method GetFlexibleDirection:Int()
+ Return bmx_wxflexgridsizer_getflexibledirection(wxSizerPtr)
End Method
Rem
- bbdoc:
+ bbdoc: Returns the value that specifies how the sizer grows in
the "non-flexible" direction if there is one.
End Rem
Method GetNonFlexibleGrowMode:Int()
+ Return bmx_wxflexgridsizer_getnonflexiblegrowmode(wxSizerPtr)
End Method
Rem
- bbdoc:
+ bbdoc: Specifies that column idx is no longer growable.
End Rem
Method RemoveGrowableCol(idx:Int)
+ bmx_wxflexgridsizer_removegrowablecol(wxSizerPtr, idx)
End Method
Rem
- bbdoc:
+ bbdoc: Specifies that row idx is no longer growable.
End Rem
Method RemoveGrowableRow(idx:Int)
+ bmx_wxflexgridsizer_removegrowablerow(wxSizerPtr, idx)
End Method
Rem
- bbdoc:
+ bbdoc: Specifies whether the sizer should flexibly resize its
columns, rows, or both.
+ about: Argument direction can be wxVERTICAL, wxHORIZONTAL or wxBOTH
(which is the default
+ value). Any other value is ignored. See GetFlexibleDirection() for
the explanation of these
+ values.
+ <p>
+ Note that this method does not trigger relayout.
+ </p>
End Rem
Method SetFlexibleDirection(direction:Int)
+ bmx_wxflexgridsizer_setflexibledirection(wxSizerPtr, direction)
End Method
Rem
- bbdoc:
+ bbdoc: Specifies how the sizer should grow in the non-flexible
direction if there is one (so SetFlexibleDirection() must have been
called previously).
+ about: Argument mode can be one of those documented in
GetNonFlexibleGrowMode, please see there
+ for their explanation.
+ <p>
+ Note that this method does not trigger relayout.
+ </p>
End Rem
Method SetNonFlexibleGrowMode(mode:Int)
+ bmx_wxflexgridsizer_setnonflexiblegrowmode(wxSizerPtr, mode)
End Method
End Type