Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-11-17 23:03:15 +00:00
parent 6fb26ea3b3
commit 2243eed573
42 changed files with 73 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
docs/motif/install.txt
View File

@@ -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:

2
include/wx/generic/laywin.h
View File

@@ -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);

8
include/wx/generic/sashwin.h
View File

@@ -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; }

2
include/wx/version.h
View File

@@ -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

2
samples/checklst/makefile.b32
View File

@@ -41,8 +41,8 @@ $(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

3
samples/config/makefile.b32
View File

@@ -40,8 +40,9 @@ c0w32.obj $(OBJECTS)
$(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

2
samples/controls/makefile.b32
View File

@@ -41,8 +41,8 @@ $(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

3
samples/dialogs/makefile.b32
View File

@@ -39,8 +39,9 @@ c0w32.obj $(OBJECTS)
$(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

2
samples/dnd/makefile.b32
View File

@@ -41,8 +41,8 @@ $(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

3
samples/docview/makefile.b32
View File

@@ -40,8 +40,9 @@ c0w32.obj $(OBJECTS)
$(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

3
samples/docvwmdi/makefile.b32
View File

@@ -40,8 +40,9 @@ c0w32.obj $(OBJECTS)
$(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

2
samples/dynamic/makefile.b32
View File

@@ -41,8 +41,8 @@ $(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

2
samples/grid/makefile.b32
View File

@@ -40,8 +40,8 @@ $(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

2
samples/internat/makefile.b32
View File

@@ -41,8 +41,8 @@ $(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

2
samples/joytest/makefile.b32
View File

@@ -40,8 +40,8 @@ $(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

2
samples/layout/makefile.b32
View File

@@ -40,8 +40,8 @@ $(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

2
samples/listctrl/makefile.b32
View File

@@ -40,8 +40,8 @@ $(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

2
samples/mdi/makefile.b32
View File

@@ -40,8 +40,8 @@ $(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

2
samples/memcheck/makefile.b32
View File

@@ -41,8 +41,8 @@ $(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

2
samples/mfc/makefile.b32
View File

@@ -52,8 +52,8 @@ $(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

3
samples/minimal/makefile.b32
View File

@@ -40,8 +40,9 @@ c0w32.obj $(OBJECTS)
$(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

2
samples/nativdlg/makefile.b32
View File

@@ -40,8 +40,8 @@ $(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

2
samples/notebook/makefile.b32
View File

@@ -41,8 +41,8 @@ $(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

2
samples/ownerdrw/makefile.b32
View File

@@ -41,8 +41,8 @@ $(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

2
samples/printing/makefile.b32
View File

@@ -40,8 +40,8 @@ $(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

2
samples/resource/makefile.b32
View File

@@ -40,8 +40,8 @@ $(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

3
samples/sashtest/makefile.b32
View File

@@ -40,8 +40,9 @@ c0w32.obj $(OBJECTS)
$(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

2
samples/splitter/makefile.b32
View File

@@ -41,8 +41,8 @@ $(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

2
samples/tab/makefile.b32
View File

@@ -41,8 +41,8 @@ $(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

2
samples/taskbar/makefile.b32
View File

@@ -41,8 +41,8 @@ $(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

2
samples/thread/makefile.b32
View File

@@ -41,8 +41,8 @@ $(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

2
samples/toolbar/makefile.b32
View File

@@ -40,8 +40,8 @@ $(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

3
samples/treectrl/makefile.b32
View File

@@ -39,8 +39,9 @@ c0w32.obj $(OBJECTS)
$(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

3
samples/typetest/makefile.b32
View File

@@ -40,8 +40,9 @@ c0w32.obj $(OBJECTS)
$(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

3
samples/validate/makefile.b32
View File

@@ -42,8 +42,9 @@ c0w32.obj $(OBJECTS)
$(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }

6
samples/wxsocket/makefile.b32
View File

@@ -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

7
src/generic/gridg.cpp
View File

@@ -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);

10
src/generic/laywin.cpp
View File

@@ -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);

2
utils/dialoged/src/makefile.b32
View File

@@ -47,8 +47,8 @@ $(TARGET)
nul
$(LIBS)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
$(INCFILE): $(MAKEFILENAME)
copy &&!

2
utils/ogl/samples/ogledit/makefile.b32
View File

@@ -63,8 +63,8 @@ ogledit
nul
$(LIBS)
ogledit.def
ogledit.res
!
brc32 -K ogledit.res
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) $(INC) -c {$< }

2
utils/wxprop/src/makefile.b32
View File

@@ -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)

2
utils/wxtree/src/makefile.b32
View File

@@ -59,8 +59,8 @@ $(TARGET)
nul
$(LIBS) $(LIBTARGET)
$(TARGET).def
$(TARGET).res
!
brc32 -K $(TARGET).res
test.obj: test.$(SRCSUFF) test.h