gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-22 05:48:01 +01:00
Code Issues Projects Releases Wiki Activity

small fixes.

Browse Source
This commit is contained in:
dan
2000-12-17 03:34:15 +00:00
parent 327d58346f
commit c11653f438
2 changed files with 42 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
WINGs/wtext.c
View File

@@ -2673,8 +2673,6 @@ insertPlainText(Text *tPtr, char *text)
else else
WMAppendTextBlock(tPtr, tb); WMAppendTextBlock(tPtr, tb);
} }
return;
} }
@@ -2682,6 +2680,7 @@ static void
rulerMoveCallBack(WMWidget *w, void *self) rulerMoveCallBack(WMWidget *w, void *self)
{ {
Text *tPtr = (Text *)self; Text *tPtr = (Text *)self;
if (!tPtr) if (!tPtr)
return; return;
if (W_CLASS(tPtr) != WC_Text) if (W_CLASS(tPtr) != WC_Text)
@@ -2695,6 +2694,7 @@ static void
rulerReleaseCallBack(WMWidget *w, void *self) rulerReleaseCallBack(WMWidget *w, void *self)
{ {
Text *tPtr = (Text *)self; Text *tPtr = (Text *)self;
if (!tPtr) if (!tPtr)
return; return;
if (W_CLASS(tPtr) != WC_Text) if (W_CLASS(tPtr) != WC_Text)
@@ -2781,7 +2781,8 @@ badbadbad = wstrdup((char *)WMDataBytes(data));
/* when it's done in WINGs, remove this */ /* when it's done in WINGs, remove this */
Bool requestDroppedData(WMView *view, WMDraggingInfo *info, char *type) Bool
requestDroppedData(WMView *view, WMDraggingInfo *info, char *type)
{ {
WMScreen *scr = W_VIEW_SCREEN(view); WMScreen *scr = W_VIEW_SCREEN(view);
@@ -2791,7 +2792,6 @@ Bool requestDroppedData(WMView *view, WMDraggingInfo *info, char *type)
scr->dragInfo.timestamp, scr->dragInfo.timestamp,
receivedData, &scr->dragInfo)) { receivedData, &scr->dragInfo)) {
wwarning("could not request data for dropped data"); wwarning("could not request data for dropped data");
} }
{ {
@@ -2980,16 +2980,11 @@ getStreamObjects(WMText *tPtr, int sel)
WMText * WMText *
WMCreateTextForDocumentType(WMWidget *parent, WMCreateTextForDocumentType(WMWidget *parent, WMAction *parser, WMAction *writer)
WMAction *parser, WMAction *writer)
{ {
Text *tPtr = wmalloc(sizeof(Text)); Text *tPtr;
if (!tPtr) {
printf("could not create text widget\n");
return NULL;
}
tPtr = wmalloc(sizeof(Text));
memset(tPtr, 0, sizeof(Text)); memset(tPtr, 0, sizeof(Text));
tPtr->widgetClass = WC_Text; tPtr->widgetClass = WC_Text;
tPtr->view = W_CreateView(W_VIEW(parent)); tPtr->view = W_CreateView(W_VIEW(parent));
@@ -3273,6 +3268,7 @@ WMCreateTextBlockWithPixmap(WMText *tPtr, WMPixmap *p,
return tb; return tb;
} }
void* void*
WMCreateTextBlockWithText(WMText *tPtr, char *text, WMFont *font, WMColor *color, WMCreateTextBlockWithText(WMText *tPtr, char *text, WMFont *font, WMColor *color,
unsigned short first, unsigned short len) unsigned short first, unsigned short len)

2
plugins/libwmfun/drawstring.c
View File

@@ -414,6 +414,7 @@ destroyDrawString (proplist_t pl, WPluginData *init_data) {
destroyDrawFreeTypeString(pl, init_data); destroyDrawFreeTypeString(pl, init_data);
} }
#ifdef USE_FREETYPE
void void
widthOfString (unsigned char *text, int length, WPluginData *func_data, widthOfString (unsigned char *text, int length, WPluginData *func_data,
int *width, int *height, int *top) { int *width, int *height, int *top) {
@@ -422,6 +423,7 @@ widthOfString (unsigned char *text, int length, WPluginData *func_data,
data = ((WPluginData*)func_data->array[0])->array[2]; data = ((WPluginData*)func_data->array[0])->array[2];
data->strwidth(text, length, func_data, width, height, top); data->strwidth(text, length, func_data, width, height, top);
} }
#endif
void void
initDrawString (proplist_t pl, WPluginData *init_data) { initDrawString (proplist_t pl, WPluginData *init_data) {