From: Julian Smart <julian@anthemion.co.uk>
Date: Tue, 17 Nov 1998 23:03:15 +0000 (+0000)
Subject: Cured BC++ makefile bug; wxGrid fix; updated Motif install.txt
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2243eed57327ce844cfaf61f25b11cf372f96309?ds=inline

Cured BC++ makefile bug; wxGrid fix; updated Motif install.txt


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/docs/motif/install.txt b/docs/motif/install.txt
index 1e82044fcf..9d6bd53a91 100644
--- a/docs/motif/install.txt
+++ b/docs/motif/install.txt
@@ -51,6 +51,15 @@ Notes:
   I'd prefer you to fix the problem and send the fix to me :-) or at
   least let me know about it.
 
+- If you run into problems with a missing X11/Xpm.h header, you
+  need to install the XPM package. It can be obtained from:
+
+  ftp://ftp.x.org/contrib/libraries/xpm-3.4k.tar.gz
+
+  Alternatively, edit include/motif/setup.h, set wxUSE_XPM
+  to 0, and recompile. You will not be able to load any XPMs,
+  though (currently the only supported colour bitmap format).
+
 - Please send bug reports with a description of your environment,
   compiler and the error message(s) to the wxwin-users mailing list at:
 
diff --git a/include/wx/generic/laywin.h b/include/wx/generic/laywin.h
index cc2f79ce8b..8383855e1b 100644
--- a/include/wx/generic/laywin.h
+++ b/include/wx/generic/laywin.h
@@ -171,7 +171,7 @@ public:
     wxLayoutAlgorithm() {}
 
     // The MDI client window is sized to whatever's left over.
-    bool LayoutMDIFrame(wxMDIParentFrame* frame);
+    bool LayoutMDIFrame(wxMDIParentFrame* frame, wxRect* rect = (wxRect*) NULL);
 
     // mainWindow is sized to whatever's left over.
     bool LayoutFrame(wxFrame* frame, wxWindow* mainWindow);
diff --git a/include/wx/generic/sashwin.h b/include/wx/generic/sashwin.h
index c1023929a2..1b1d8e0e7e 100644
--- a/include/wx/generic/sashwin.h
+++ b/include/wx/generic/sashwin.h
@@ -74,23 +74,23 @@ public:
 
     // Normal constructor
     wxSashWindow(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name = "splitter");
+        const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name = "sashWindow");
     ~wxSashWindow();
 
     // Set whether there's a sash in this position
     void SetSashVisible(wxSashEdgePosition edge, bool sash);
 
     // Get whether there's a sash in this position
-    inline bool GetSashVisible(wxSashEdgePosition edge) { return m_sashes[edge].m_show; }
+    inline bool GetSashVisible(wxSashEdgePosition edge) const { return m_sashes[edge].m_show; }
 
     // Set whether there's a border in this position
     inline void SetSashBorder(wxSashEdgePosition edge, bool border) { m_sashes[edge].m_border = border; }
 
     // Get whether there's a border in this position
-    inline bool HasBorder(wxSashEdgePosition edge) { return m_sashes[edge].m_border; }
+    inline bool HasBorder(wxSashEdgePosition edge) const { return m_sashes[edge].m_border; }
 
     // Get border size
-    inline int GetEdgeMargin(wxSashEdgePosition edge) { return m_sashes[edge].m_margin; }
+    inline int GetEdgeMargin(wxSashEdgePosition edge) const { return m_sashes[edge].m_margin; }
 
     // Sets the default sash border size
     inline void SetDefaultBorderSize(int width) { m_borderSize = width; }
diff --git a/include/wx/version.h b/include/wx/version.h
index 68f7db190e..d5dc85bd37 100644
--- a/include/wx/version.h
+++ b/include/wx/version.h
@@ -18,7 +18,7 @@
 #define wxRELEASE_NUMBER   0
 #define wxVERSION_STRING "wxWindows 2.0"
 #define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER
-#define wxBETA_NUMBER      12
+#define wxBETA_NUMBER      13
 #define wxVERSION_FLOAT float(wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0))
 
 #endif
diff --git a/samples/checklst/makefile.b32 b/samples/checklst/makefile.b32
index 59adb52171..51646091bd 100644
--- a/samples/checklst/makefile.b32
+++ b/samples/checklst/makefile.b32
@@ -41,8 +41,8 @@ $(TARGET)
 nul
 $(LIBS)
 $(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/config/makefile.b32 b/samples/config/makefile.b32
index 156228fc4a..9efb63a4c6 100644
--- a/samples/config/makefile.b32
+++ b/samples/config/makefile.b32
@@ -40,8 +40,9 @@ c0w32.obj $(OBJECTS)
 $(TARGET)
 nul
 $(LIBS)
+$(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/controls/makefile.b32 b/samples/controls/makefile.b32
index 783ce3b083..c216b916ce 100644
--- a/samples/controls/makefile.b32
+++ b/samples/controls/makefile.b32
@@ -41,8 +41,8 @@ $(TARGET)
 nul
 $(LIBS)
 $(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/dialogs/makefile.b32 b/samples/dialogs/makefile.b32
index e314db0425..9adc7a3a59 100644
--- a/samples/dialogs/makefile.b32
+++ b/samples/dialogs/makefile.b32
@@ -39,8 +39,9 @@ c0w32.obj $(OBJECTS)
 $(TARGET)
 nul
 $(LIBS)
+$(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/dnd/makefile.b32 b/samples/dnd/makefile.b32
index 7644caa99a..3c621c9453 100644
--- a/samples/dnd/makefile.b32
+++ b/samples/dnd/makefile.b32
@@ -41,8 +41,8 @@ $(TARGET)
 nul
 $(LIBS)
 $(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/docview/makefile.b32 b/samples/docview/makefile.b32
index f81b4d3365..af6ada9c79 100644
--- a/samples/docview/makefile.b32
+++ b/samples/docview/makefile.b32
@@ -40,8 +40,9 @@ c0w32.obj $(OBJECTS)
 $(TARGET)
 nul
 $(LIBS)
+$(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/docvwmdi/makefile.b32 b/samples/docvwmdi/makefile.b32
index f81b4d3365..af6ada9c79 100644
--- a/samples/docvwmdi/makefile.b32
+++ b/samples/docvwmdi/makefile.b32
@@ -40,8 +40,9 @@ c0w32.obj $(OBJECTS)
 $(TARGET)
 nul
 $(LIBS)
+$(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/dynamic/makefile.b32 b/samples/dynamic/makefile.b32
index 4ade0dedcc..6d46438ffc 100644
--- a/samples/dynamic/makefile.b32
+++ b/samples/dynamic/makefile.b32
@@ -41,8 +41,8 @@ $(TARGET)
 nul
 $(LIBS)
 $(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/grid/makefile.b32 b/samples/grid/makefile.b32
index d1707b1542..2b65f4cc56 100644
--- a/samples/grid/makefile.b32
+++ b/samples/grid/makefile.b32
@@ -40,8 +40,8 @@ $(TARGET)
 nul
 $(LIBS)
 $(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/internat/makefile.b32 b/samples/internat/makefile.b32
index 3396034cc7..8f3f025fe1 100644
--- a/samples/internat/makefile.b32
+++ b/samples/internat/makefile.b32
@@ -41,8 +41,8 @@ $(TARGET)
 nul
 $(LIBS)
 $(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/joytest/makefile.b32 b/samples/joytest/makefile.b32
index d889d44cee..7720955b44 100644
--- a/samples/joytest/makefile.b32
+++ b/samples/joytest/makefile.b32
@@ -40,8 +40,8 @@ $(TARGET)
 nul
 $(LIBS)
 $(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/layout/makefile.b32 b/samples/layout/makefile.b32
index 765fe58400..b392b020db 100644
--- a/samples/layout/makefile.b32
+++ b/samples/layout/makefile.b32
@@ -40,8 +40,8 @@ $(TARGET)
 nul
 $(LIBS)
 $(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/listctrl/makefile.b32 b/samples/listctrl/makefile.b32
index 2218343eb0..529b8e0844 100644
--- a/samples/listctrl/makefile.b32
+++ b/samples/listctrl/makefile.b32
@@ -40,8 +40,8 @@ $(TARGET)
 nul
 $(LIBS)
 $(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/mdi/makefile.b32 b/samples/mdi/makefile.b32
index 85fad37374..a1f94adf84 100644
--- a/samples/mdi/makefile.b32
+++ b/samples/mdi/makefile.b32
@@ -40,8 +40,8 @@ $(TARGET)
 nul
 $(LIBS)
 $(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/memcheck/makefile.b32 b/samples/memcheck/makefile.b32
index 9c079154ca..190001d338 100644
--- a/samples/memcheck/makefile.b32
+++ b/samples/memcheck/makefile.b32
@@ -41,8 +41,8 @@ $(TARGET)
 nul
 $(LIBS)
 $(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/mfc/makefile.b32 b/samples/mfc/makefile.b32
index 9f0993827d..31974a5610 100644
--- a/samples/mfc/makefile.b32
+++ b/samples/mfc/makefile.b32
@@ -52,8 +52,8 @@ $(TARGET)
 nul
 $(LIBS)
 $(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/minimal/makefile.b32 b/samples/minimal/makefile.b32
index 2e98af0de0..3d7a859ea5 100644
--- a/samples/minimal/makefile.b32
+++ b/samples/minimal/makefile.b32
@@ -40,8 +40,9 @@ c0w32.obj $(OBJECTS)
 $(TARGET)
 nul
 $(LIBS)
+$(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/nativdlg/makefile.b32 b/samples/nativdlg/makefile.b32
index 0d75d38135..2bc53604dd 100644
--- a/samples/nativdlg/makefile.b32
+++ b/samples/nativdlg/makefile.b32
@@ -40,8 +40,8 @@ $(TARGET)
 nul
 $(LIBS)
 $(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/notebook/makefile.b32 b/samples/notebook/makefile.b32
index 0c3c463b8e..54ae659bc5 100644
--- a/samples/notebook/makefile.b32
+++ b/samples/notebook/makefile.b32
@@ -41,8 +41,8 @@ $(TARGET)
 nul
 $(LIBS)
 $(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/ownerdrw/makefile.b32 b/samples/ownerdrw/makefile.b32
index 771353702f..ad4d7fffa8 100644
--- a/samples/ownerdrw/makefile.b32
+++ b/samples/ownerdrw/makefile.b32
@@ -41,8 +41,8 @@ $(TARGET)
 nul
 $(LIBS)
 $(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/printing/makefile.b32 b/samples/printing/makefile.b32
index df6457fae4..a27c4e2da8 100644
--- a/samples/printing/makefile.b32
+++ b/samples/printing/makefile.b32
@@ -40,8 +40,8 @@ $(TARGET)
 nul
 $(LIBS)
 $(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/resource/makefile.b32 b/samples/resource/makefile.b32
index 3807df095d..6780eb5ec3 100644
--- a/samples/resource/makefile.b32
+++ b/samples/resource/makefile.b32
@@ -40,8 +40,8 @@ $(TARGET)
 nul
 $(LIBS)
 $(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/sashtest/makefile.b32 b/samples/sashtest/makefile.b32
index 41d21cdccb..53b5657332 100644
--- a/samples/sashtest/makefile.b32
+++ b/samples/sashtest/makefile.b32
@@ -40,8 +40,9 @@ c0w32.obj $(OBJECTS)
 $(TARGET)
 nul
 $(LIBS)
+$(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/splitter/makefile.b32 b/samples/splitter/makefile.b32
index 9fd8e32307..886b39eddc 100644
--- a/samples/splitter/makefile.b32
+++ b/samples/splitter/makefile.b32
@@ -41,8 +41,8 @@ $(TARGET)
 nul
 $(LIBS)
 $(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/tab/makefile.b32 b/samples/tab/makefile.b32
index ea1478ac72..305f4cbfc2 100644
--- a/samples/tab/makefile.b32
+++ b/samples/tab/makefile.b32
@@ -41,8 +41,8 @@ $(TARGET)
 nul
 $(LIBS)
 $(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/taskbar/makefile.b32 b/samples/taskbar/makefile.b32
index 497d91192b..bdaebda7bd 100644
--- a/samples/taskbar/makefile.b32
+++ b/samples/taskbar/makefile.b32
@@ -41,8 +41,8 @@ $(TARGET)
 nul
 $(LIBS)
 $(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/thread/makefile.b32 b/samples/thread/makefile.b32
index 85a669d762..92abaf1428 100644
--- a/samples/thread/makefile.b32
+++ b/samples/thread/makefile.b32
@@ -41,8 +41,8 @@ $(TARGET)
 nul
 $(LIBS)
 $(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/toolbar/makefile.b32 b/samples/toolbar/makefile.b32
index 658649b453..9f32c974ba 100644
--- a/samples/toolbar/makefile.b32
+++ b/samples/toolbar/makefile.b32
@@ -40,8 +40,8 @@ $(TARGET)
 nul
 $(LIBS)
 $(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/treectrl/makefile.b32 b/samples/treectrl/makefile.b32
index 44aa809a54..0dddc9cdf8 100644
--- a/samples/treectrl/makefile.b32
+++ b/samples/treectrl/makefile.b32
@@ -39,8 +39,9 @@ c0w32.obj $(OBJECTS)
 $(TARGET)
 nul
 $(LIBS)
+$(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/typetest/makefile.b32 b/samples/typetest/makefile.b32
index ac386695cc..47c0494fdc 100644
--- a/samples/typetest/makefile.b32
+++ b/samples/typetest/makefile.b32
@@ -40,8 +40,9 @@ c0w32.obj $(OBJECTS)
 $(TARGET)
 nul
 $(LIBS)
+$(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/validate/makefile.b32 b/samples/validate/makefile.b32
index 3f50a7d4a9..ebadbaf433 100644
--- a/samples/validate/makefile.b32
+++ b/samples/validate/makefile.b32
@@ -42,8 +42,9 @@ c0w32.obj $(OBJECTS)
 $(TARGET)
 nul
 $(LIBS)
+$(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) -c {$< }
diff --git a/samples/wxsocket/makefile.b32 b/samples/wxsocket/makefile.b32
index 41cfc45071..94a0ed2b5b 100644
--- a/samples/wxsocket/makefile.b32
+++ b/samples/wxsocket/makefile.b32
@@ -50,8 +50,9 @@ $(CLIENT_TARGET).exe:   $(CLIENT_OBJECTS) $(CLIENT_TARGET).res
   $(CLIENT_TARGET)
   nul
   $(LIBS)
+  $(CLIENT_TARGET).def
+  $(CLIENT_TARGET).res
 !
-          brc32 -K $(CLIENT_TARGET).res
 
 client.obj:     client.cpp
 
@@ -64,8 +65,9 @@ $(SERVER_TARGET).exe:   $(SERVER_OBJECTS) $(SERVER_TARGET).res
   $(SERVER_TARGET)
   nul
   $(LIBS)
+  $(SERVER_TARGET).def
+  $(SERVER_TARGET).res
 !
-        brc32 -K $(SERVER_TARGET).res
 
 server.obj:     server.cpp
 
diff --git a/src/generic/gridg.cpp b/src/generic/gridg.cpp
index 24554d3133..1db2cede13 100644
--- a/src/generic/gridg.cpp
+++ b/src/generic/gridg.cpp
@@ -2321,7 +2321,12 @@ void wxGenericGrid::SetGridCursor(int row, int col)
   
   m_wCursorRow = row;
   m_wCursorColumn = col;
-  SetCurrentRect(row, col);
+
+  int cw, ch;
+  GetClientSize(&cw, &ch);
+
+  SetCurrentRect(row, col, cw, ch);
+
   if (m_currentRectVisible)
     HighlightCell(& dc);
 
diff --git a/src/generic/laywin.cpp b/src/generic/laywin.cpp
index 2d27635bd9..88677b3780 100644
--- a/src/generic/laywin.cpp
+++ b/src/generic/laywin.cpp
@@ -48,16 +48,13 @@ wxSashLayoutWindow::wxSashLayoutWindow(wxWindow *parent, wxWindowID id, const wx
     m_alignment = wxLAYOUT_TOP;
 }
 
-// These are the functions that wxWin will call to ascertain the window
+// This is the function that wxLayoutAlgorithm calls to ascertain the window
 // dimensions.
 void wxSashLayoutWindow::OnQueryLayoutInfo(wxQueryLayoutInfoEvent& event)
 {
   //    int flags = event.GetFlags();
     int requestedLength = event.GetRequestedLength();
 
-    // This code won't be in the final thing, it's just so we don't have to give it
-    // real windows: mock up some dimensions.
-
     event.SetOrientation(m_orientation);
     event.SetAlignment(m_alignment);
 
@@ -69,7 +66,6 @@ void wxSashLayoutWindow::OnQueryLayoutInfo(wxQueryLayoutInfoEvent& event)
 
 // Called by parent to allow window to take a bit out of the
 // client rectangle, and size itself if not in wxLAYOUT_QUERY mode.
-// Will eventually be an event.
 
 void wxSashLayoutWindow::OnCalculateLayout(wxCalculateLayoutEvent& event)
 {
@@ -168,12 +164,14 @@ void wxSashLayoutWindow::OnCalculateLayout(wxCalculateLayoutEvent& event)
 
 // Lays out windows for an MDI frame. The MDI client area gets what's left
 // over.
-bool wxLayoutAlgorithm::LayoutMDIFrame(wxMDIParentFrame* frame)
+bool wxLayoutAlgorithm::LayoutMDIFrame(wxMDIParentFrame* frame, wxRect* r)
 {
     int cw, ch;
     frame->GetClientSize(& cw, & ch);
 
     wxRect rect(0, 0, cw, ch);
+    if (r)
+        rect = * r;
 
     wxCalculateLayoutEvent event;
     event.SetRect(rect);
diff --git a/utils/dialoged/src/makefile.b32 b/utils/dialoged/src/makefile.b32
index 775201c4ae..e7a2611ad8 100644
--- a/utils/dialoged/src/makefile.b32
+++ b/utils/dialoged/src/makefile.b32
@@ -47,8 +47,8 @@ $(TARGET)
 nul
 $(LIBS)
 $(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 $(INCFILE):	$(MAKEFILENAME)
 	copy &&!
diff --git a/utils/ogl/samples/ogledit/makefile.b32 b/utils/ogl/samples/ogledit/makefile.b32
index ffe204cf46..ea10bbf38b 100644
--- a/utils/ogl/samples/ogledit/makefile.b32
+++ b/utils/ogl/samples/ogledit/makefile.b32
@@ -63,8 +63,8 @@ ogledit
 nul
 $(LIBS)
 ogledit.def
+ogledit.res
 !
-        brc32 -K ogledit.res
 
 .$(SRCSUFF).obj:
 	bcc32 $(CPPFLAGS) $(INC) -c {$< }
diff --git a/utils/wxprop/src/makefile.b32 b/utils/wxprop/src/makefile.b32
index 57b94770dd..6520bd5c60 100644
--- a/utils/wxprop/src/makefile.b32
+++ b/utils/wxprop/src/makefile.b32
@@ -62,8 +62,8 @@ $(TARGET)
 nul
 $(LIBS) $(LIBTARGET)
 $(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 $(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
     brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
diff --git a/utils/wxtree/src/makefile.b32 b/utils/wxtree/src/makefile.b32
index 764b5fd123..bb7a97aeb2 100644
--- a/utils/wxtree/src/makefile.b32
+++ b/utils/wxtree/src/makefile.b32
@@ -59,8 +59,8 @@ $(TARGET)
 nul
 $(LIBS) $(LIBTARGET)
 $(TARGET).def
+$(TARGET).res
 !
-        brc32 -K $(TARGET).res
 
 test.obj:	test.$(SRCSUFF) test.h