Altered font dialog slightly for Motif; added wxUSE_TOOLTIPS to Motif setup.h

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

distrib/msw/cw.rsp

@@ -5,8 +5,6 @@ include/wx_cw.pch
 include/wx_cw.pch++
 include/wx_cw_d.pch
 include/wx_cw_d.pch++
-include/wx_x86++_d.mch
-include/wx_x86_d.mch
 
 samples/bombs/make_cw.mcp
 

docs/motif/install.txt

@@ -13,6 +13,9 @@ wxWindows 2.0 for Motif installation
   files to Unix format. Don't worry about files being
   overwritten: they should be identical anyway.
 
+  (See http://www.cdrom.com/pub/infozip/ if you don't have zip/unzip
+  already installed. Zip isn't the same as gzip!)
+
 - It is recommended that you install bison and flex; using yacc
   and lex may require tweaking of the makefiles. You also need
   Xpm (see comments in the Notes section below).

include/wx/motif/setup.h

@@ -21,14 +21,9 @@
                                 // Use constraints mechanism
 #define wxUSE_CONFIG           1
                                 // Use wxConfig, with CreateConfig in wxApp
-#define _WX_GOODCOMPILER__
+#define WXWIN_COMPATIBILITY  0
-                                // gcc can have problems, but Windows compilers
+                                // Minor compatibility with 1.68 API.
-                                // are generally OK.
+                                // 1: on 0: off.
-#define WXWIN_COMPATIBILITY  1
-                                // Compatibility with 1.66 API.
-                                // Level 0: no backward compatibility, all new features
-                                // Level 1: wxDC, OnSize (etc.) compatibility, but
-                                //          some new features such as event tables
 
 #define wxUSE_POSTSCRIPT  1
                         	// 0 for no PostScript device context
@@ -140,6 +135,9 @@
 #define wxUSE_SERIAL        0
                                   // Use serialization
 
+#define wxUSE_TOOLTIPS      0
+                                  // Use tooltips
+
 /*
  * Finer detail
  *

include/wx/motif/window.h

@@ -249,7 +249,7 @@ public:
   void SetToolTip(const wxString& tip);
 
   // TODO
-#if 0
+#if wxUSE_TOOLTIPS
     // pointer may be NULL to remove the tooltip
   void SetToolTip(wxToolTip *tooltip);
     // get the current tooltip (may return NULL if none)

include/wx/tooltip.h

@@ -4,7 +4,7 @@
 #if defined(__WXMSW__)
 #include "wx/msw/tooltip.h"
 #elif defined(__WXMOTIF__)
-#include "wx/motif/tooltip.h"
+// #include "wx/motif/tooltip.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/tooltip.h"
 #elif defined(__WXQT__)
@@ -12,7 +12,7 @@
 #elif defined(__WXMAC__)
 #include "wx/mac/tooltip.h"
 #elif defined(__WXSTUBS__)
-#include "wx/stubs/tooltip.h"
+// #include "wx/stubs/tooltip.h"
 #endif
 
 #endif

samples/makefile.unx

@@ -19,7 +19,6 @@ all:
 	cd config; $(MAKE) -f makefile.unx $(TARGET)
 	cd controls; $(MAKE) -f makefile.unx $(TARGET)
 	cd dialogs; $(MAKE) -f makefile.unx $(TARGET)
-	cd dnd; $(MAKE) -f makefile.unx $(TARGET)
 	cd docview; $(MAKE) -f makefile.unx $(TARGET)
 	cd docvwmdi; $(MAKE) -f makefile.unx $(TARGET)
 	cd dynamic; $(MAKE) -f makefile.unx $(TARGET)
@@ -32,7 +31,6 @@ all:
 	cd memcheck; $(MAKE) -f makefile.unx $(TARGET)
 	cd minifram; $(MAKE) -f makefile.unx $(TARGET)
 	cd minimal; $(MAKE) -f makefile.unx $(TARGET)
-	cd nativdlg; $(MAKE) -f makefile.unx $(TARGET)
 	cd notebook; $(MAKE) -f makefile.unx $(TARGET)
 	cd printing; $(MAKE) -f makefile.unx $(TARGET)
 	cd proplist; $(MAKE) -f makefile.unx $(TARGET)
@@ -40,19 +38,19 @@ all:
 	cd sashtest; $(MAKE) -f makefile.unx $(TARGET)
 	cd splitter; $(MAKE) -f makefile.unx $(TARGET)
 	cd tab; $(MAKE) -f makefile.unx $(TARGET)
-	cd thread; $(MAKE) -f makefile.unx $(TARGET)
 	cd toolbar; $(MAKE) -f makefile.unx $(TARGET)
 	cd typetest; $(MAKE) -f makefile.unx $(TARGET)
 	cd validate; $(MAKE) -f makefile.unx $(TARGET)
 	cd treectrl; $(MAKE) -f makefile.unx $(TARGET)
 	cd wxpoem; $(MAKE) -f makefile.unx $(TARGET)
+	cd dnd; $(MAKE) -f makefile.unx $(TARGET)
+	cd thread; $(MAKE) -f makefile.unx $(TARGET)
 
 clean:
 	cd bombs; $(MAKE) -f makefile.unx clean$(TARGET)
 	cd config; $(MAKE) -f makefile.unx clean$(TARGET)
 	cd controls; $(MAKE) -f makefile.unx clean$(TARGET)
 	cd dialogs; $(MAKE) -f makefile.unx clean$(TARGET)
-	cd dnd; $(MAKE) -f makefile.unx clean$(TARGET)
 	cd docview; $(MAKE) -f makefile.unx clean$(TARGET)
 	cd docvwmdi; $(MAKE) -f makefile.unx clean$(TARGET)
 	cd dynamic; $(MAKE) -f makefile.unx clean$(TARGET)
@@ -65,7 +63,6 @@ clean:
 	cd memcheck; $(MAKE) -f makefile.unx clean$(TARGET)
 	cd minifram; $(MAKE) -f makefile.unx clean$(TARGET)
 	cd minimal; $(MAKE) -f makefile.unx clean$(TARGET)
-	cd nativdlg; $(MAKE) -f makefile.unx clean$(TARGET)
 	cd notebook; $(MAKE) -f makefile.unx clean$(TARGET)
 	cd printing; $(MAKE) -f makefile.unx clean$(TARGET)
 	cd proplist; $(MAKE) -f makefile.unx clean$(TARGET)
@@ -73,12 +70,13 @@ clean:
 	cd sashtest; $(MAKE) -f makefile.unx clean$(TARGET)
 	cd splitter; $(MAKE) -f makefile.unx clean$(TARGET)
 	cd tab; $(MAKE) -f makefile.unx clean$(TARGET)
-	cd thread; $(MAKE) -f makefile.unx clean$(TARGET)
 	cd toolbar; $(MAKE) -f makefile.unx clean$(TARGET)
 	cd typetest; $(MAKE) -f makefile.unx clean$(TARGET)
 	cd validate; $(MAKE) -f makefile.unx clean$(TARGET)
 	cd treectrl; $(MAKE) -f makefile.unx clean$(TARGET)
 	cd wxpoem; $(MAKE) -f makefile.unx clean$(TARGET)
+	cd dnd; $(MAKE) -f makefile.unx clean$(TARGET)
+	cd thread; $(MAKE) -f makefile.unx clean$(TARGET)
 
 cleanmotif: clean
 motif: all

src/generic/fontdlgg.cpp

@@ -223,10 +223,10 @@ void wxGenericFontDialog::CreateWidgets(void)
   int x=-1;
   int y=40;
   familyChoice = new wxChoice(this, wxID_FONT_FAMILY, wxPoint(10, 10), wxSize(120, -1), 5, families);
-  styleChoice = new wxChoice(this, wxID_FONT_STYLE, wxPoint(160, 10), wxSize(120, -1), 3, styles);
+  styleChoice = new wxChoice(this, wxID_FONT_STYLE, wxPoint(170, 10), wxSize(120, -1), 3, styles);
-  weightChoice = new wxChoice(this, wxID_FONT_WEIGHT, wxPoint(310, 10), wxSize(120, -1), 3, weights);
+  weightChoice = new wxChoice(this, wxID_FONT_WEIGHT, wxPoint(330, 10), wxSize(120, -1), 3, weights);
 
-  colourChoice = new wxChoice(this, wxID_FONT_COLOUR, wxPoint(10, 40), wxSize(190, -1), NUM_COLS, wxColourDialogNames);
+  colourChoice = new wxChoice(this, wxID_FONT_COLOUR, wxPoint(10, 40), wxSize(180, -1), NUM_COLS, wxColourDialogNames);
 #if 0 // def __WXMOTIF__ // TODO: This necessary now?
   // We want the pointSizeText to line up on the y axis with the colourChoice
   colourChoice->GetPosition(&fontRect.x, &y); //NL mod
@@ -271,7 +271,8 @@ void wxGenericFontDialog::CreateWidgets(void)
 
   okButton->SetDefault();
 
-  SetClientSize(450, by + 40);
+  //  SetClientSize(450, by + 40);
+  Fit();
 
   Centre(wxBOTH);